rpms/nant/devel nant-app.patch, 1.4, 1.5 nant.spec, 1.14, 1.15 nant-0.86-app-libdir.patch, 1.1, NONE
Paul F. Johnson (pfj)
fedora-extras-commits at redhat.com
Tue Mar 11 22:45:38 UTC 2008
- Previous message (by thread): rpms/frysk/devel .cvsignore,1.50,1.51 sources,1.50,1.51
- Next message (by thread): rpms/selinux-policy/devel policy-init.patch, NONE, 1.1 policy-20071130.patch, 1.94, 1.95 selinux-policy.spec, 1.628, 1.629
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pfj
Update of /cvs/pkgs/rpms/nant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14118/devel
Modified Files:
nant.spec
Added Files:
nant-app.patch
Removed Files:
nant-0.86-app-libdir.patch
Log Message:
Nant now works!
nant-app.patch:
Index: nant-app.patch
===================================================================
RCS file: nant-app.patch
diff -N nant-app.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nant-app.patch 11 Mar 2008 22:45:37 -0000 1.5
@@ -0,0 +1,419 @@
+--- nant-0.86-beta1/src/NAnt.Console/App.config 2007-12-08 10:30:44.000000000 +0000
++++ nant-0.86-beta1/src/NAnt.Console/App.config-new 2008-03-06 23:42:35.000000000 +0000
+@@ -776,8 +776,8 @@
+ >
+ <runtime>
+ <probing-paths>
+- <directory name="lib/mono/1.0" />
+- <directory name="lib/mono/neutral" />
++ <directory name="lib/mono/1.0" />
++ <directory name="lib/mono/neutral" />
+ <directory name="lib/common/1.1" />
+ <directory name="lib/common/neutral" />
+ </probing-paths>
+@@ -976,8 +976,8 @@
+ >
+ <runtime>
+ <probing-paths>
+- <directory name="lib/mono/2.0" />
+- <directory name="lib/mono/neutral" />
++ <directory name="lib/mono/2.0" />
++ <directory name="lib/mono/neutral" />
+ <directory name="lib/common/2.0" />
+ <directory name="lib/common/neutral" />
+ </probing-paths>
+@@ -1141,153 +1141,7 @@
+ </task>
+ </tasks>
+ </framework>
+- <framework
+- name="mono-3.5"
+- family="mono"
+- version="3.5"
+- description="Mono 3.5 Profile"
+- sdkdirectory="${toolDirectory}"
+- frameworkdirectory="${toolDirectory}"
+- frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}"
+- clrversion="2.0.50727"
+- >
+- <runtime>
+- <probing-paths>
+- <directory name="lib/mono/2.0" />
+- <directory name="lib/mono/neutral" />
+- <directory name="lib/common/2.0" />
+- <directory name="lib/common/neutral" />
+- </probing-paths>
+- <modes>
+- <auto>
+- <engine program="${runtimeEngine}" />
+- <environment>
+- <variable name="PATH" path="${path::combine(sdkInstallRoot, 'bin')};%PATH%" />
+- <variable name="MONO_CFG_DIR" path="${configDir};%MONO_CFG_DIR%" />
+- </environment>
+- </auto>
+- <strict>
+- <engine program="${runtimeEngine}">
+- <arg value="--runtime=v2.0.50727" />
+- </engine>
+- <environment>
+- <variable name="PATH" path="${path::combine(sdkInstallRoot, 'bin')};%PATH%" />
+- <variable name="MONO_CFG_DIR" path="${configDir};%MONO_CFG_DIR%" />
+- </environment>
+- </strict>
+- </modes>
+- </runtime>
+- <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'mono/3.5')}">
+- <include name="*.dll" />
+- </reference-assemblies>
+- <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'mono/3.0')}">
+- <include name="*.dll" />
+- </reference-assemblies>
+- <reference-assemblies basedir="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}">
+- <include name="*.dll" />
+- </reference-assemblies>
+- <task-assemblies>
+- <!-- include Mono version-neutral assemblies -->
+- <include name="extensions/mono/neutral/**/*.dll" />
+- <!-- include Mono 2.0 specific assemblies -->
+- <include name="extensions/mono/2.0/**/*.dll" />
+- <!-- include .NET 2.0 specific assemblies -->
+- <include name="extensions/common/2.0/**/*.dll" />
+- </task-assemblies>
+- <tool-paths>
+- <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/3.5')}" />
+- <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
+- <directory name="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
+- </tool-paths>
+- <project>
+- <!-- quick and dirty check to see if pkg-config is available (and configured) -->
+- <property name="pkgconfig.available" value="${environment::variable-exists('PKG_CONFIG_PATH')}" />
+- <if test="${pkgconfig.available}">
+- <if test="${pkg-config::exists('mono')}">
+- <call target="configure-from-pkg-config" />
+- </if>
+- <if test="${not pkg-config::exists('mono')}">
+- <call target="configure-from-registry" />
+- </if>
+- </if>
+- <if test="${not pkgconfig.available}">
+- <call target="configure-from-registry" />
+- </if>
+-
+- <property name="toolDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/3.5')}" />
+- <property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
+-
+- <target name="configure-from-pkg-config">
+- <property name="mono.version" value="${pkg-config::get-mod-version('mono')}" />
+- <property name="sdkInstallRoot" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'prefix'))}" />
+- <property name="frameworkAssemblyDirectory" value="${cygpath::get-windows-path(pkg-config::get-variable('mono', 'libdir'))}" />
+- <property name="configDir" value="${path::combine(sdkInstallRoot, 'etc')}/" />
+- </target>
+-
+- <target name="configure-from-registry">
+- <readregistry
+- property="mono.version"
+- key="SOFTWARE\Novell\Mono\DefaultCLR"
+- hive="LocalMachine"
+- />
+- <property name="monokey" value="SOFTWARE\Novell\Mono\${mono.version}" />
+-
+- <readregistry
+- property="sdkInstallRoot"
+- key="${monokey}\SdkInstallRoot"
+- hive="LocalMachine" />
+- <readregistry
+- property="frameworkAssemblyDirectory"
+- key="${monokey}\FrameworkAssemblyDirectory"
+- hive="LocalMachine" />
+- <readregistry
+- property="configDir"
+- key="${monokey}\MonoConfigDir"
+- hive="LocalMachine" />
+- </target>
+- </project>
+- <properties>
+- </properties>
+- <tasks>
+- <task name="al">
+- <attribute name="managed">true</attribute>
+- </task>
+- <task name="csc">
+- <attribute name="exename">gmcs</attribute>
+- <attribute name="managed">true</attribute>
+- <attribute name="langversion">linq</attribute>
+- <attribute name="supportspackagereferences">true</attribute>
+- <attribute name="supportsnowarnlist">true</attribute>
+- <attribute name="supportsdocgeneration">true</attribute>
+- <attribute name="supportskeycontainer">true</attribute>
+- <attribute name="supportskeyfile">true</attribute>
+- <attribute name="supportsdelaysign">true</attribute>
+- <attribute name="supportslangversion">true</attribute>
+- </task>
+- <task name="jsc">
+- <attribute name="exename">mjs</attribute>
+- <attribute name="managed">strict</attribute>
+- </task>
+- <task name="vbc">
+- <attribute name="exename">vbnc</attribute>
+- <attribute name="managed">true</attribute>
+- </task>
+- <task name="resgen">
+- <attribute name="managed">true</attribute>
+- <attribute name="supportsexternalfilereferences">true</attribute>
+- </task>
+- <task name="delay-sign">
+- <attribute name="exename">sn</attribute>
+- <attribute name="managed">true</attribute>
+- </task>
+- <task name="license">
+- <attribute name="hascommandlinecompiler">false</attribute>
+- </task>
+- <task name="ilasm">
+- <attribute name="managed">true</attribute>
+- </task>
+- </tasks>
+- </framework>
++
+ <framework
+ name="moonlight-2.0"
+ family="moonlight"
+@@ -1308,7 +1162,7 @@
+ </auto>
+ </modes>
+ </runtime>
+- <reference-assemblies basedir="${path::combine(prefix, 'lib/mono/2.1')}">
++ <reference-assemblies basedir="${path::combine(prefix, '@LIB@///mono/2.1')}">
+ <include name="agclr.dll" />
+ <include name="Microsoft.VisualBasic.dll" />
+ <include name="mscorlib.dll" />
+@@ -1479,13 +1333,13 @@
+ description="Mono 1.0 Profile"
+ sdkdirectory="${toolDirectory}"
+ frameworkdirectory="${toolDirectory}"
+- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/1.0')}"
++ frameworkassemblydirectory="${path::combine(prefix, '@LIB@///mono/1.0')}"
+ clrversion="1.1.4322"
+ >
+ <runtime>
+ <probing-paths>
+- <directory name="lib/mono/1.0" />
+- <directory name="lib/mono/neutral" />
++ <directory name="@LIB@///mono/1.0" />
++ <directory name="@LIB@///mono/neutral" />
+ <directory name="lib/common/1.1" />
+ <directory name="lib/common/neutral" />
+ </probing-paths>
+@@ -1500,7 +1354,7 @@
+ </strict>
+ </modes>
+ </runtime>
+- <reference-assemblies basedir="${path::combine(prefix, 'lib/mono/1.0')}">
++ <reference-assemblies basedir="${path::combine(prefix, '@LIB@///mono/1.0')}">
+ <include name="*.dll" />
+ </reference-assemblies>
+ <task-assemblies>
+@@ -1525,7 +1379,7 @@
+ <property name="csc.supportsdocgeneration" value="false" />
+ </if>
+ <if test="${pkg-config::is-atleast-version('mono', '1.1')}">
+- <property name="toolDirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
++ <property name="toolDirectory" value="${path::combine(prefix, '@LIB@///mono/1.0')}" />
+ <property name="resgen.tool" value="resgen" />
+ <property name="csc.supportsdocgeneration" value="true" />
+ </if>
+@@ -1535,7 +1389,7 @@
+ <attribute name="managed">true</attribute>
+ </task>
+ <task name="csc">
+- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, '@LIB@///mono/1.0/mcs.exe')}</attribute>
+ <attribute name="managed">true</attribute>
+ <attribute name="supportspackagereferences">true</attribute>
+ <attribute name="supportsnowarnlist">true</attribute>
+@@ -1550,7 +1404,7 @@
+ <attribute name="managed">true</attribute>
+ </task>
+ <task name="vbc">
+- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, '@LIB@///mono/1.0/mbas.exe')}</attribute>
+ <attribute name="managed">true</attribute>
+ </task>
+ <task name="resgen">
+@@ -1576,13 +1430,13 @@
+ description="Mono 2.0 Profile"
+ sdkdirectory="${toolDirectory}"
+ frameworkdirectory="${toolDirectory}"
+- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}"
++ frameworkassemblydirectory="${path::combine(prefix, '@LIB@///mono/2.0')}"
+ clrversion="2.0.50727"
+ >
+ <runtime>
+ <probing-paths>
+- <directory name="lib/mono/2.0" />
+- <directory name="lib/mono/neutral" />
++ <directory name="lib/mono/2.0" />
++ <directory name="lib/mono/neutral" />
+ <directory name="lib/common/2.0" />
+ <directory name="lib/common/neutral" />
+ </probing-paths>
+@@ -1597,7 +1451,7 @@
+ </strict>
+ </modes>
+ </runtime>
+- <reference-assemblies basedir="${path::combine(prefix, 'lib/mono/2.0')}">
++ <reference-assemblies basedir="${path::combine(prefix, '@LIB@///mono/2.0')}">
+ <include name="*.dll" />
+ </reference-assemblies>
+ <task-assemblies>
+@@ -1610,7 +1464,7 @@
+ </task-assemblies>
+ <tool-paths>
+ <directory name="${toolDirectory}" />
+- <directory name="${path::combine(prefix, 'lib/mono/1.0')}" />
++ <directory name="${path::combine(prefix, '@LIB@///mono/1.0')}" />
+ </tool-paths>
+ <project>
+ <if test="${not pkg-config::exists('mono')}">
+@@ -1624,7 +1478,7 @@
+ <property name="csc.supportsdocgeneration" value="false" />
+ </if>
+ <if test="${pkg-config::is-atleast-version('mono', '1.1')}">
+- <property name="toolDirectory" value="${path::combine(prefix, 'lib/mono/2.0')}" />
++ <property name="toolDirectory" value="${path::combine(prefix, '@LIB@///mono/2.0')}" />
+ <property name="resgen.tool" value="resgen" />
+ <property name="csc.supportsdocgeneration" value="true" />
+ </if>
+@@ -1673,104 +1527,7 @@
+ </task>
+ </tasks>
+ </framework>
+- <framework
+- name="mono-3.5"
+- family="mono"
+- version="3.5"
+- description="Mono 3.5 Profile"
+- sdkdirectory="${toolDirectory}"
+- frameworkdirectory="${toolDirectory}"
+- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}"
+- clrversion="2.0.50727"
+- >
+- <runtime>
+- <probing-paths>
+- <directory name="lib/mono/2.0" />
+- <directory name="lib/mono/neutral" />
+- <directory name="lib/common/2.0" />
+- <directory name="lib/common/neutral" />
+- </probing-paths>
+- <modes>
+- <auto>
+- <engine program="${path::combine(prefix, 'bin/mono')}" />
+- </auto>
+- <strict>
+- <engine program="${path::combine(prefix, 'bin/mono')}">
+- <arg value="--runtime=v2.0.50727" />
+- </engine>
+- </strict>
+- </modes>
+- </runtime>
+- <reference-assemblies basedir="${path::combine(prefix, 'lib/mono/3.5')}">
+- <include name="*.dll" />
+- </reference-assemblies>
+- <reference-assemblies basedir="${path::combine(prefix, 'lib/mono/3.0')}">
+- <include name="*.dll" />
+- </reference-assemblies>
+- <reference-assemblies basedir="${path::combine(prefix, 'lib/mono/2.0')}">
+- <include name="*.dll" />
+- </reference-assemblies>
+- <task-assemblies>
+- <!-- include Mono version-neutral assemblies -->
+- <include name="extensions/mono/neutral/**/*.dll" />
+- <!-- include Mono 2.0 specific assemblies -->
+- <include name="extensions/mono/2.0/**/*.dll" />
+- <!-- include .NET 2.0 specific assemblies -->
+- <include name="extensions/common/2.0/**/*.dll" />
+- </task-assemblies>
+- <tool-paths>
+- <directory name="${toolDirectory}" />
+- <directory name="${path::combine(prefix, 'lib/mono/2.0')}" />
+- <directory name="${path::combine(prefix, 'lib/mono/1.0')}" />
+- </tool-paths>
+- <project>
+- <if test="${not pkg-config::exists('mono')}">
+- <fail>Unable to locate 'mono' module using pkg-config. Download the Mono development packages from http://www.mono-project.com/downloads/.</fail>
+- </if>
+- <property name="resgen.supportsexternalfilereferences" value="false" />
+- <property name="prefix" value="${pkg-config::get-variable('mono', 'prefix')}" />
+- <property name="toolDirectory" value="${path::combine(prefix, 'lib/mono/3.5')}" />
+- </project>
+- <tasks>
+- <task name="al">
+- <attribute name="managed">true</attribute>
+- </task>
+- <task name="csc">
+- <attribute name="exename">gmcs</attribute>
+- <attribute name="managed">true</attribute>
+- <attribute name="langversion">linq</attribute>
+- <attribute name="supportspackagereferences">true</attribute>
+- <attribute name="supportsnowarnlist">true</attribute>
+- <attribute name="supportsdocgeneration">true</attribute>
+- <attribute name="supportskeycontainer">true</attribute>
+- <attribute name="supportskeyfile">true</attribute>
+- <attribute name="supportsdelaysign">true</attribute>
+- <attribute name="supportslangversion">true</attribute>
+- </task>
+- <task name="jsc">
+- <attribute name="exename">mjs</attribute>
+- <attribute name="managed">strict</attribute>
+- </task>
+- <task name="vbc">
+- <attribute name="exename">vbnc</attribute>
+- <attribute name="managed">true</attribute>
+- </task>
+- <task name="resgen">
+- <attribute name="managed">true</attribute>
+- <attribute name="supportsexternalfilereferences">true</attribute>
+- </task>
+- <task name="delay-sign">
+- <attribute name="exename">sn</attribute>
+- <attribute name="managed">true</attribute>
+- </task>
+- <task name="license">
+- <attribute name="hascommandlinecompiler">false</attribute>
+- </task>
+- <task name="ilasm">
+- <attribute name="managed">true</attribute>
+- </task>
+- </tasks>
+- </framework>
++
+ <framework
+ name="moonlight-2.0"
+ family="moonlight"
+@@ -1791,7 +1548,7 @@
+ </auto>
+ </modes>
+ </runtime>
+- <reference-assemblies basedir="${path::combine(prefix, 'lib/mono/2.1')}">
++ <reference-assemblies basedir="${path::combine(prefix, '@LIB@///mono/2.1')}">
+ <include name="agclr.dll" />
+ <include name="Microsoft.VisualBasic.dll" />
+ <include name="mscorlib.dll" />
+@@ -1814,15 +1571,15 @@
+ </task-assemblies>
+ <tool-paths>
+ <directory name="${toolDirectory}" />
+- <directory name="${path::combine(prefix, 'lib/mono/2.0')}" />
+- <directory name="${path::combine(prefix, 'lib/mono/1.0')}" />
++ <directory name="${path::combine(prefix, '@LIB@///mono/2.0')}" />
++ <directory name="${path::combine(prefix, '@LIB@///mono/1.0')}" />
+ </tool-paths>
+ <project>
+ <if test="${not pkg-config::exists('mono')}">
+ <fail>Unable to locate 'mono' module using pkg-config. Download the Mono development packages from http://www.mono-project.com/downloads/.</fail>
+ </if>
+ <property name="prefix" value="${pkg-config::get-variable('mono', 'prefix')}" />
+- <property name="toolDirectory" value="${path::combine(prefix, 'lib/mono/2.1')}" />
++ <property name="toolDirectory" value="${path::combine(prefix, '@LIB@///mono/2.1')}" />
+ </project>
+ <tasks>
+ <task name="csc">
Index: nant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nant/devel/nant.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nant.spec 24 Feb 2008 22:00:52 -0000 1.14
+++ nant.spec 11 Mar 2008 22:45:37 -0000 1.15
@@ -1,15 +1,14 @@
%define debug_package %{nil}
-
%define monodir %{_libdir}
%define mlib %{_lib}
Summary: NAnt is a build tool for Mono and .NET
Name: nant
-Version: 0.86
-Release: 2%{?dist}
+Version: 0.86
+Release: 5%{?dist}
Source0: http://download.sourceforge.net/nant/%{name}-%{version}-beta1-src.tar.gz
Patch0: nant-build.patch
-Patch1: nant-0.86-app-libdir.patch
+Patch1: nant-app.patch
License: GPL
Group: Development/Tools
Url: http://nant.sourceforge.net/
@@ -17,7 +16,7 @@
BuildRequires: mono-devel
Requires(post): scrollkeeper
Requires(postun): scrollkeeper
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
%description
NAnt is a free .NET build tool. In theory it is kind of like make
@@ -29,13 +28,13 @@
Requires: %{name} = %{version}-%{release}
%description docs
-Documentation of nant
+Documentation for nant
%prep
%setup -q -n %{name}-%{version}-beta1
-sed -i -e "s/@LIBDIR@/%{mlib}/" %{PATCH1}
+sed -i -e 's!@LIB@!%{_lib}!' %{PATCH1}
%patch1 -p1 -b .orig
-sed -i -e "s/%{mlib}/@LIBDIR@/" %{PATCH1}
+sed -i -e 's!%{_lib}!@LIB@/!' %{PATCH1}
%patch0 -p1 -b .orig
sed -i -e "s/@LIB@/%{_lib}/" NAnt.build
sed -i -e "s!@BUILDROOT@!%{buildroot}/usr!" NAnt.build
@@ -77,15 +76,8 @@
%doc examples/* doc/help/*
%changelog
-* Sun Feb 24 2008 David Nielsen <gnomeuser at gmail.com> - 0.86-2
-- forgot, no mono-devel on ppc64
-
-* Sun Feb 24 2008 David Nielsen <gnomeuser at gmail.com> - 0.86-1
-- enable ppc/ppc64
-- bump to 0.86-beta1
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.85-18
-- Autorebuild for GCC 4.3
+* Thu Mar 06 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.86-5
+- bump to beta 1
* Mon Nov 12 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.85-17
- removed excludearch in favour of exclusivearch
--- nant-0.86-app-libdir.patch DELETED ---
- Previous message (by thread): rpms/frysk/devel .cvsignore,1.50,1.51 sources,1.50,1.51
- Next message (by thread): rpms/selinux-policy/devel policy-init.patch, NONE, 1.1 policy-20071130.patch, 1.94, 1.95 selinux-policy.spec, 1.628, 1.629
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list