rpms/nant/devel nant-0.85-api.patch, NONE, 1.1 nant-app.patch, 1.5, 1.6 nant.spec, 1.16, 1.17 sources, 1.4, 1.5
Alex Lancaster (alexlan)
fedora-extras-commits at redhat.com
Tue Apr 8 01:57:14 UTC 2008
Author: alexlan
Update of /cvs/pkgs/rpms/nant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20130
Modified Files:
nant-app.patch nant.spec sources
Added Files:
nant-0.85-api.patch
Log Message:
Add the nant-0.85-api.patch. Rollback the nant-app.patch to the one
that works against 0.85. Also rollback sources.
nant-0.85-api.patch:
--- NEW FILE nant-0.85-api.patch ---
diff -uraN nant-0.85.orig/src/NAnt.DotNet/Tasks/ScriptTask.cs nant-0.85/src/NAnt.DotNet/Tasks/ScriptTask.cs
--- nant-0.85.orig/src/NAnt.DotNet/Tasks/ScriptTask.cs 2008-03-27 11:34:21.257506822 +0100
+++ nant-0.85/src/NAnt.DotNet/Tasks/ScriptTask.cs 2008-03-27 11:38:37.163506860 +0100
@@ -516,7 +516,7 @@
#region Private Static Methods
private static CodeDomProvider CreateCodeDomProvider(string typeName, string assemblyName) {
- Assembly providerAssembly = Assembly.LoadWithPartialName(assemblyName);
+ Assembly providerAssembly = Assembly.Load(assemblyName);
if (providerAssembly == null) {
throw new ArgumentException(string.Format(CultureInfo.InvariantCulture,
ResourceUtils.GetString("NA2037"), assemblyName));
nant-app.patch:
Index: nant-app.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nant/devel/nant-app.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nant-app.patch 11 Mar 2008 22:45:37 -0000 1.5
+++ nant-app.patch 8 Apr 2008 01:56:59 -0000 1.6
@@ -1,419 +1,339 @@
---- 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 @@
+--- 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 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, '@LIBDIR@/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>
-@@ -976,8 +976,8 @@
+ <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>\@LIBDIR@\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, '@LIBDIR@/mono/1.0/mcs.exe')}" />
++ <property name="mbas.tool" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/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>\@LIBDIR@\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, '@LIBDIR@/mono/1.0')}" />
++ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/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, '@LIBDIR@/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>
-@@ -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}"
+ <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, '@LIBDIR@/mono/2.0')}" />
++ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/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, '@LIBDIR@/mono/1.0')}" />
++ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/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, '@LIBDIR@/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, '@LIBDIR@/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, '@LIBDIR@/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, '@LIBDIR@/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, '@LIBDIR@/mono/2.0')}" />
++ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/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, '@LIBDIR@/mono/1.0')}" />
++ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/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, '@LIBDIR@/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, '@LIBDIR@/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, '@LIBDIR@/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')}"
-- 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')}"
++ frameworkassemblydirectory="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/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, '@LIBDIR@/mono/2.0')}" />
++ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/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, '@LIBDIR@/mono/1.0')}" />
++ <property name="sdkDirectory" value="${path::combine(frameworkAssemblyDirectory, '@LIBDIR@/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, '@LIBDIR@/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, '@LIBDIR@/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, '@LIBDIR@/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, '@LIBDIR@/mono/1.0')}"
++ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/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 @@
+@@ -1338,7 +1338,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="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
++ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/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>
+@@ -1349,7 +1349,7 @@
+ <attribute name="useruntimeengine">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="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mcs.exe')}</attribute>
+ <attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
-@@ -1550,7 +1404,7 @@
- <attribute name="managed">true</attribute>
+@@ -1359,7 +1359,7 @@
+ <attribute name="supportslangversion">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>
+- <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
+ <attribute name="useruntimeengine">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')}"
+@@ -1387,7 +1387,7 @@
+ runtimeengine="${path::combine(prefix, 'bin/mono')}"
+ sdkdirectory="${frameworkdirectory}"
+ frameworkdirectory="${frameworkdirectory}"
+- frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
++ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/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 @@
+@@ -1416,9 +1416,9 @@
+ for the 2.0 profile, for the other tools we should
+ use the 1.0 profile version
+ -->
+- <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
++ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/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, '@LIBDIR@/mono/2.0/resgen.exe')}" />
++ <property name="resgen.tool" value="${path::combine(prefix, '@LIBDIR@/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" />
+@@ -1432,7 +1432,7 @@
+ <attribute name="useruntimeengine">true</attribute>
+ </task>
+ <task name="csc">
+- <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
+ <attribute name="useruntimeengine">true</attribute>
+ <attribute name="supportspackagereferences">true</attribute>
+ <attribute name="supportsnowarnlist">true</attribute>
+@@ -1443,7 +1443,7 @@
+ </task>
+ <task name="vbc">
+ <!-- there is no mbas for the 2.0 profile yet -->
+- <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
+ <attribute name="useruntimeengine">true</attribute>
+ </task>
+ <task name="resgen">
+@@ -1471,7 +1471,7 @@
+ runtimeengine="${path::combine(prefix, 'bin/mono')}"
+ sdkdirectory="${frameworkdirectory}"
+ frameworkdirectory="${frameworkdirectory}"
+- frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
++ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
+ clrversion="2.0.50215"
+ >
+ <task-assemblies>
+@@ -1500,9 +1500,9 @@
+ for the 2.0 profile, for the other tools we should
+ use the 1.0 profile version
+ -->
+- <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
++ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/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, '@LIBDIR@/mono/2.0/resgen.exe')}" />
++ <property name="resgen.tool" value="${path::combine(prefix, '@LIBDIR@/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" />
+@@ -1516,7 +1516,7 @@
+ <attribute name="useruntimeengine">true</attribute>
</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">
+- <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
+ <attribute name="useruntimeengine">true</attribute>
+ <attribute name="supportspackagereferences">true</attribute>
+ <attribute name="supportsnowarnlist">true</attribute>
+@@ -1527,7 +1527,7 @@
+ </task>
+ <task name="vbc">
+ <!-- there is no mbas for the 2.0 profile yet -->
+- <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
+ <attribute name="useruntimeengine">true</attribute>
+ </task>
+ <task name="resgen">
+@@ -1555,7 +1555,7 @@
+ runtimeengine="${path::combine(prefix, 'bin/mono')}"
+ sdkdirectory="${frameworkdirectory}"
+ frameworkdirectory="${frameworkdirectory}"
+- frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
++ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
+ clrversion="2.0.40607"
+ >
+ <task-assemblies>
+@@ -1584,9 +1584,9 @@
+ for the 2.0 profile, for the other tools we should
+ use the 1.0 profile version
+ -->
+- <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
++ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/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, '@LIBDIR@/mono/2.0/resgen.exe')}" />
++ <property name="resgen.tool" value="${path::combine(prefix, '@LIBDIR@/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" />
+@@ -1600,7 +1600,7 @@
+ <attribute name="useruntimeengine">true</attribute>
+ </task>
+ <task name="csc">
+- <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
+ <attribute name="useruntimeengine">true</attribute>
+ <attribute name="supportspackagereferences">true</attribute>
+ <attribute name="supportsnowarnlist">true</attribute>
+@@ -1611,7 +1611,7 @@
+ </task>
+ <task name="vbc">
+ <!-- there is no mbas for the 2.0 profile yet -->
+- <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
++ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
+ <attribute name="useruntimeengine">true</attribute>
+ </task>
+ <task name="resgen">
Index: nant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nant/devel/nant.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nant.spec 8 Apr 2008 01:35:43 -0000 1.16
+++ nant.spec 8 Apr 2008 01:56:59 -0000 1.17
@@ -7,7 +7,7 @@
Version: 0.85
Release: 18%{?dist}
Epoch: 1
-Source0: http://download.sourceforge.net/nant/%{name}-%{version}-beta1-src.tar.gz
+Source0: http://download.sourceforge.net/nant/%{name}-%{version}-src.tar.gz
Patch0: nant-build.patch
Patch1: nant-app.patch
Patch2: nant-0.85-api.patch
@@ -34,11 +34,11 @@
%prep
%setup -q -n %{name}-%{version}
-%patch2 -p1 -b .orig
-sed -i -e 's!@LIB@!%{_lib}!' %{PATCH1}
+sed -i -e "s/@LIBDIR@/%{mlib}/" %{PATCH1}
%patch1 -p1 -b .orig
-sed -i -e 's!%{_lib}!@LIB@/!' %{PATCH1}
+sed -i -e "s/%{mlib}/@LIBDIR@/" %{PATCH1}
%patch0 -p1 -b .orig
+%patch2 -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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nant/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 24 Feb 2008 21:46:57 -0000 1.4
+++ sources 8 Apr 2008 01:56:59 -0000 1.5
@@ -1 +1 @@
-6e5e5ba4515bde5668c085807322a1f3 nant-0.86-beta1-src.tar.gz
+45ae065439b6cbc0e02051b855843f50 nant-0.85-src.tar.gz
More information about the fedora-extras-commits
mailing list