rpms/nant/devel nant-app.patch, 1.1, 1.2 nant.spec, 1.4, 1.5 nant-exe.patch, 1.1, NONE nant-libdir.patch, 1.2, NONE
Paul F. Johnson (pfj)
fedora-extras-commits at redhat.com
Sat Sep 16 12:03:35 UTC 2006
Author: pfj
Update of /cvs/extras/rpms/nant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26918/devel
Modified Files:
nant-app.patch nant.spec
Removed Files:
nant-exe.patch nant-libdir.patch
Log Message:
auto-import nant-0.85-9 on branch devel from nant-0.85-9.src.rpm
nant-app.patch:
Index: nant-app.patch
===================================================================
RCS file: /cvs/extras/rpms/nant/devel/nant-app.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nant-app.patch 16 Sep 2006 00:55:03 -0000 1.1
+++ nant-app.patch 16 Sep 2006 12:03:35 -0000 1.2
@@ -1,11 +1,195 @@
--- nant-0.85-rc4/src/NAnt.Console/App.config 2006-04-24 13:18:36.000000000 +0100
-+++ nant-0.85-rc4/src/NAnt.Console/App-new.config 2006-09-16 00:07:39.000000000 +0100
++++ nant-0.85-rc4/src/NAnt.Console/App-new.config 2006-09-16 11:50:31.000000000 +0100
+@@ -543,7 +543,7 @@
+ runtimeengine="${runtimeEngine}"
+ sdkdirectory="${sdkDirectory}"
+ frameworkdirectory="${frameworkDirectory}"
+- frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}"
++ frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0')}"
+ clrversion="1.1.4322"
+ >
+ <task-assemblies>
+@@ -578,8 +578,8 @@
+ <property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
+ <property name="resgen.tool" value="monoresgen" />
+ <!-- in Mono 1.0.x, only mcs and mbas are located in <install root>\lib\mono\<profile> -->
+- <property name="csc.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mcs.exe')}" />
+- <property name="mbas.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mbas.exe')}" />
++ <property name="csc.tool" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0/mcs.exe')}" />
++ <property name="mbas.tool" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0/mbas.exe')}" />
+ <!-- /doc is not supported in Mono 1.0.x -->
+ <property name="csc.supportsdocgeneration" value="false" />
+
+@@ -599,8 +599,8 @@
+ are located in the <install root>\lib\mono\<profile>
+ directory
+ -->
+- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
+- <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
++ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0')}" />
++ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0')}" />
+ <property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
+ <!-- starting from Mono 1.1.9.2, mono.exe is located in the bin directory -->
+ <if test="${not file::exists(runtimeEngine)}">
+@@ -713,7 +713,7 @@
+ runtimeengine="${runtimeEngine}"
+ sdkdirectory="${sdkDirectory}"
+ frameworkdirectory="${frameworkDirectory}"
+- frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}"
++ frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0')}"
+ clrversion="2.0.50727"
+ >
+ <task-assemblies>
+@@ -771,18 +771,18 @@
+ use the 1.0 profile version
+ -->
+ <!--
+- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
+- <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
++ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0')}" />
++ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0')}" />
+ -->
+- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
+- <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
++ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0')}" />
++ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0')}" />
+ <property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
+ <!-- starting from Mono 1.1.9.2, mono.exe is located in the bin directory -->
+ <if test="${not file::exists(runtimeEngine)}">
+ <property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
+ </if>
+ <!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
+- <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0/resgen.exe')}" />
++ <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0/resgen.exe')}" />
+ <if test="${not file::exists(resgen.tool)}">
+ <!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
+ <property name="resgen.tool" value="resgen" />
+@@ -853,7 +853,7 @@
+ <attribute name="useruntimeengine">true</attribute>
+ </task>
+ <task name="csc">
+- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/2.0/gmcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0/gmcs.exe')}</attribute>
+ <attribute name="useruntimeengine">true</attribute>
+ <attribute name="supportspackagereferences">true</attribute>
+ <attribute name="supportsnowarnlist">true</attribute>
+@@ -864,7 +864,7 @@
+ </task>
+ <task name="vbc">
+ <!-- there is no mbas for the 2.0 profile yet -->
+- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mbas.exe')}</attribute>
++ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0/mbas.exe')}</attribute>
+ <attribute name="useruntimeengine">true</attribute>
+ </task>
+ <task name="resgen">
+@@ -892,7 +892,7 @@
+ runtimeengine="${runtimeEngine}"
+ sdkdirectory="${sdkDirectory}"
+ frameworkdirectory="${frameworkDirectory}"
+- frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}"
++ frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0')}"
+ clrversion="2.0.50215"
+ >
+ <task-assemblies>
+@@ -950,18 +950,18 @@
+ use the 1.0 profile version
+ -->
+ <!--
+- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
+- <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
++ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0')}" />
++ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0')}" />
+ -->
+- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
+- <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
++ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0')}" />
++ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0')}" />
+ <property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
+ <!-- starting from Mono 1.1.9.2, mono.exe is located in the bin directory -->
+ <if test="${not file::exists(runtimeEngine)}">
+ <property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
+ </if>
+ <!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
+- <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0/resgen.exe')}" />
++ <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0/resgen.exe')}" />
+ <if test="${not file::exists(resgen.tool)}">
+ <!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
+ <property name="resgen.tool" value="resgen" />
+@@ -1032,7 +1032,7 @@
+ <attribute name="useruntimeengine">true</attribute>
+ </task>
+ <task name="csc">
+- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/2.0/gmcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0/gmcs.exe')}</attribute>
+ <attribute name="useruntimeengine">true</attribute>
+ <attribute name="supportspackagereferences">true</attribute>
+ <attribute name="supportsnowarnlist">true</attribute>
+@@ -1043,7 +1043,7 @@
+ </task>
+ <task name="vbc">
+ <!-- there is no mbas for the 2.0 profile yet -->
+- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mbas.exe')}</attribute>
++ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0/mbas.exe')}</attribute>
+ <attribute name="useruntimeengine">true</attribute>
+ </task>
+ <task name="resgen">
+@@ -1071,7 +1071,7 @@
+ runtimeengine="${runtimeEngine}"
+ sdkdirectory="${sdkDirectory}"
+ frameworkdirectory="${frameworkDirectory}"
+- frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}"
++ frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0')}"
+ clrversion="2.0.40607"
+ >
+ <task-assemblies>
+@@ -1129,18 +1129,18 @@
+ use the 1.0 profile version
+ -->
+ <!--
+- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
+- <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0')}" />
++ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0')}" />
++ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0')}" />
+ -->
+- <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
+- <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0')}" />
++ <property name="frameworkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0')}" />
++ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0')}" />
+ <property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
+ <!-- starting from Mono 1.1.9.2, mono.exe is located in the bin directory -->
+ <if test="${not file::exists(runtimeEngine)}">
+ <property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
+ </if>
+ <!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
+- <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0/resgen.exe')}" />
++ <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0/resgen.exe')}" />
+ <if test="${not file::exists(resgen.tool)}">
+ <!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
+ <property name="resgen.tool" value="resgen" />
+@@ -1211,7 +1211,7 @@
+ <attribute name="useruntimeengine">true</attribute>
+ </task>
+ <task name="csc">
+- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/2.0/gmcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'lib64/mono/2.0/gmcs.exe')}</attribute>
+ <attribute name="useruntimeengine">true</attribute>
+ <attribute name="supportspackagereferences">true</attribute>
+ <attribute name="supportsnowarnlist">true</attribute>
+@@ -1222,7 +1222,7 @@
+ </task>
+ <task name="vbc">
+ <!-- there is no mbas for the 2.0 profile yet -->
+- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mbas.exe')}</attribute>
++ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'lib64/mono/1.0/mbas.exe')}</attribute>
+ <attribute name="useruntimeengine">true</attribute>
+ </task>
+ <task name="resgen">
@@ -1318,7 +1318,7 @@
runtimeengine="${path::combine(prefix, 'bin/mono')}"
sdkdirectory="${frameworkdirectory}"
frameworkdirectory="${frameworkdirectory}"
- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/1.0')}"
-+ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/1.0')}"
++ frameworkassemblydirectory="${path::combine(prefix, 'lib64/mono/1.0')}"
clrversion="1.1.4322"
>
<task-assemblies>
@@ -14,7 +198,7 @@
</if>
<if test="${pkg-config::is-atleast-version('mono', '1.1')}">
- <property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
-+ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
++ <property name="frameworkdirectory" value="${path::combine(prefix, 'lib64/mono/1.0')}" />
<property name="resgen.tool" value="resgen" />
<property name="csc.supportsdocgeneration" value="true" />
</if>
@@ -23,7 +207,7 @@
</task>
<task name="csc">
- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mcs.exe')}</attribute>
-+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, 'lib64/mono/1.0/mcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -32,7 +216,7 @@
</task>
<task name="vbc">
- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
-+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, 'lib64/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
@@ -41,7 +225,7 @@
sdkdirectory="${frameworkdirectory}"
frameworkdirectory="${frameworkdirectory}"
- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}"
-+ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
++ frameworkassemblydirectory="${path::combine(prefix, 'lib64/mono/2.0')}"
clrversion="2.0.50727"
>
<task-assemblies>
@@ -50,10 +234,10 @@
use the 1.0 profile version
-->
- <property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
-+ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
++ <property name="frameworkdirectory" value="${path::combine(prefix, 'lib64/mono/1.0')}" />
<!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
- <property name="resgen.tool" value="${path::combine(prefix, 'lib/mono/2.0/resgen.exe')}" />
-+ <property name="resgen.tool" value="${path::combine(prefix, '@LIBDIR@/mono/2.0/resgen.exe')}" />
++ <property name="resgen.tool" value="${path::combine(prefix, 'lib64/mono/2.0/resgen.exe')}" />
<if test="${not file::exists(resgen.tool)}">
<!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
<property name="resgen.tool" value="resgen" />
@@ -62,7 +246,7 @@
</task>
<task name="csc">
- <attribute name="exename">${path::combine(prefix, 'lib/mono/2.0/gmcs.exe')}</attribute>
-+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, 'lib64/mono/2.0/gmcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -71,7 +255,7 @@
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
-+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, 'lib64/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
@@ -80,7 +264,7 @@
sdkdirectory="${frameworkdirectory}"
frameworkdirectory="${frameworkdirectory}"
- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}"
-+ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
++ frameworkassemblydirectory="${path::combine(prefix, 'lib64/mono/2.0')}"
clrversion="2.0.50215"
>
<task-assemblies>
@@ -89,10 +273,10 @@
use the 1.0 profile version
-->
- <property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
-+ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
++ <property name="frameworkdirectory" value="${path::combine(prefix, 'lib64/mono/1.0')}" />
<!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
- <property name="resgen.tool" value="${path::combine(prefix, 'lib/mono/2.0/resgen.exe')}" />
-+ <property name="resgen.tool" value="${path::combine(prefix, '@LIBDIR@/mono/2.0/resgen.exe')}" />
++ <property name="resgen.tool" value="${path::combine(prefix, 'lib64/mono/2.0/resgen.exe')}" />
<if test="${not file::exists(resgen.tool)}">
<!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
<property name="resgen.tool" value="resgen" />
@@ -101,7 +285,7 @@
</task>
<task name="csc">
- <attribute name="exename">${path::combine(prefix, 'lib/mono/2.0/gmcs.exe')}</attribute>
-+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, 'lib64/mono/2.0/gmcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -110,7 +294,7 @@
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
-+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, 'lib64/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
@@ -119,7 +303,7 @@
sdkdirectory="${frameworkdirectory}"
frameworkdirectory="${frameworkdirectory}"
- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}"
-+ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
++ frameworkassemblydirectory="${path::combine(prefix, 'lib64/mono/2.0')}"
clrversion="2.0.40607"
>
<task-assemblies>
@@ -128,10 +312,10 @@
use the 1.0 profile version
-->
- <property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
-+ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
++ <property name="frameworkdirectory" value="${path::combine(prefix, 'lib64/mono/1.0')}" />
<!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
- <property name="resgen.tool" value="${path::combine(prefix, 'lib/mono/2.0/resgen.exe')}" />
-+ <property name="resgen.tool" value="${path::combine(prefix, '@LIBDIR@/mono/2.0/resgen.exe')}" />
++ <property name="resgen.tool" value="${path::combine(prefix, 'lib64/mono/2.0/resgen.exe')}" />
<if test="${not file::exists(resgen.tool)}">
<!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
<property name="resgen.tool" value="resgen" />
@@ -140,7 +324,7 @@
</task>
<task name="csc">
- <attribute name="exename">${path::combine(prefix, 'lib/mono/2.0/gmcs.exe')}</attribute>
-+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, 'lib64/mono/2.0/gmcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -149,7 +333,7 @@
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
-+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, 'lib64/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
Index: nant.spec
===================================================================
RCS file: /cvs/extras/rpms/nant/devel/nant.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nant.spec 16 Sep 2006 10:12:26 -0000 1.4
+++ nant.spec 16 Sep 2006 12:03:35 -0000 1.5
@@ -12,12 +12,10 @@
Summary: NAnt is a build tool for Mono and .NET
Name: nant
Version: 0.85
-Release: 8%{?dist}
+Release: 9%{?dist}
Source0: http://download.sourceforge.net/nant/%{name}-%{version}-%{extra}-src.tar.gz
-Source1: nant-exe.patch
-Source2: nant-app.patch
-Patch0: nant-libdir.patch
-Patch1: nant-build.patch
+Patch0: nant-build.patch
+Patch1: nant-app.patch
License: GPL
Group: Development/Tools
Url: http://nant.sourceforge.net/
@@ -41,13 +39,10 @@
%prep
%setup -q -n %{name}-%{version}-%{extra}
%if "%{?fedora}" > "5"
-%patch0 -p1 -b .orig
-cp %{SOURCE1} nant-exe.patch
-cp %{SOURCE2} nant-app.patch
-sed -i -e "s/@LIBDIR@/%{mlib}/" nant-exe.patch
-sed -i -e "s/@LIBDIR@/%{mlib}/" nant-app.patch
-%endif
+sed -i -e "s/@LIBDIR@/%{mlib}/" %{PATCH1}
%patch1 -p1 -b .orig
+%endif
+%patch0 -p1 -b .orig
sed -i -e "s/@LIB@/%{_lib}/" NAnt.build
sed -i -e "s!@BUILDROOT@!%{buildroot}/usr!" NAnt.build
find . -type d|xargs chmod 755
@@ -88,6 +83,9 @@
%doc examples/* doc/help/*
%changelog
+* Sat Sep 16 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.85-9
+- more 64bit fixes
+
* Sat Sep 16 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.85-8
- scrollkeeper fixes
--- nant-exe.patch DELETED ---
--- nant-libdir.patch DELETED ---
More information about the fedora-extras-commits
mailing list