rpms/nant/devel nant-0.86-app-libdir.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 nant.spec, 1.12, 1.13 sources, 1.3, 1.4 nant-app.patch, 1.3, NONE nant-core-task.patch, 1.1, NONE
David Nielsen (dnielsen)
fedora-extras-commits at redhat.com
Sun Feb 24 21:47:31 UTC 2008
Author: dnielsen
Update of /cvs/pkgs/rpms/nant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15270/devel
Modified Files:
.cvsignore nant.spec sources
Added Files:
nant-0.86-app-libdir.patch
Removed Files:
nant-app.patch nant-core-task.patch
Log Message:
bump to 0.86-beta1 and build on all arch (this is expected to fail)
nant-0.86-app-libdir.patch:
--- NEW FILE nant-0.86-app-libdir.patch ---
diff -uraN nant-0.86-beta1.orig/src/NAnt.Console/App.config nant-0.86-beta1/src/NAnt.Console/App.config
--- nant-0.86-beta1.orig/src/NAnt.Console/App.config 2007-12-08 11:30:44.000000000 +0100
+++ nant-0.86-beta1/src/NAnt.Console/App.config 2008-02-24 22:26:36.000000000 +0100
@@ -45,8 +45,8 @@
<probing-paths>
<directory name="lib/net/1.0" />
<directory name="lib/net/neutral" />
- <directory name="lib/common/1.0" />
- <directory name="lib/common/neutral" />
+ <directory name="@LIBDIR@/common/1.0" />
+ <directory name="@LIBDIR@/common/neutral" />
</probing-paths>
<modes>
@@ -144,8 +144,8 @@
<probing-paths>
<directory name="lib/net/1.1" />
<directory name="lib/net/neutral" />
- <directory name="lib/common/1.1" />
- <directory name="lib/common/neutral" />
+ <directory name="@LIBDIR@/common/1.1" />
+ <directory name="@LIBDIR@/common/neutral" />
</probing-paths>
<modes>
<strict>
@@ -237,8 +237,8 @@
<probing-paths>
<directory name="lib/net/2.0" />
<directory name="lib/net/neutral" />
- <directory name="lib/common/2.0" />
- <directory name="lib/common/neutral" />
+ <directory name="@LIBDIR@/common/2.0" />
+ <directory name="@LIBDIR@/common/neutral" />
</probing-paths>
<modes>
<strict>
@@ -367,8 +367,8 @@
<probing-paths>
<directory name="lib/net/2.0" />
<directory name="lib/net/neutral" />
- <directory name="lib/common/2.0" />
- <directory name="lib/common/neutral" />
+ <directory name="@LIBDIR@/common/2.0" />
+ <directory name="@LIBDIR@/common/neutral" />
</probing-paths>
<modes>
<strict>
@@ -776,10 +776,10 @@
>
<runtime>
<probing-paths>
- <directory name="lib/mono/1.0" />
- <directory name="lib/mono/neutral" />
- <directory name="lib/common/1.1" />
- <directory name="lib/common/neutral" />
+ <directory name="@LIBDIR@/mono/1.0" />
+ <directory name="@LIBDIR@/mono/neutral" />
+ <directory name="@LIBDIR@/common/1.1" />
+ <directory name="@LIBDIR@/common/neutral" />
</probing-paths>
<modes>
<auto>
@@ -976,10 +976,10 @@
>
<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" />
+ <directory name="@LIBDIR@/mono/2.0" />
+ <directory name="@LIBDIR@/mono/neutral" />
+ <directory name="@LIBDIR@/common/2.0" />
+ <directory name="@LIBDIR@/common/neutral" />
</probing-paths>
<modes>
<auto>
@@ -1153,10 +1153,10 @@
>
<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" />
+ <directory name="@LIBDIR@/mono/2.0" />
+ <directory name="@LIBDIR@/mono/neutral" />
+ <directory name="@LIBDIR@/common/2.0" />
+ <directory name="@LIBDIR@/common/neutral" />
</probing-paths>
<modes>
<auto>
@@ -1308,7 +1308,7 @@
</auto>
</modes>
</runtime>
- <reference-assemblies basedir="${path::combine(prefix, 'lib/mono/2.1')}">
+ <reference-assemblies basedir="${path::combine(prefix, '@LIBDIR@/mono/2.1')}">
<include name="agclr.dll" />
<include name="Microsoft.VisualBasic.dll" />
<include name="mscorlib.dll" />
@@ -1479,15 +1479,15 @@
description="Mono 1.0 Profile"
sdkdirectory="${toolDirectory}"
frameworkdirectory="${toolDirectory}"
- frameworkassemblydirectory="${path::combine(prefix, 'lib/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/common/1.1" />
- <directory name="lib/common/neutral" />
+ <directory name="@LIBDIR@/mono/1.0" />
+ <directory name="@LIBDIR@/mono/neutral" />
+ <directory name="@LIBDIR@/common/1.1" />
+ <directory name="@LIBDIR@/common/neutral" />
</probing-paths>
<modes>
<auto>
@@ -1500,7 +1500,7 @@
</strict>
</modes>
</runtime>
- <reference-assemblies basedir="${path::combine(prefix, 'lib/mono/1.0')}">
+ <reference-assemblies basedir="${path::combine(prefix, '@LIBDIR@/mono/1.0')}">
<include name="*.dll" />
</reference-assemblies>
<task-assemblies>
@@ -1525,7 +1525,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, '@LIBDIR@/mono/1.0')}" />
<property name="resgen.tool" value="resgen" />
<property name="csc.supportsdocgeneration" value="true" />
</if>
@@ -1535,7 +1535,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, '@LIBDIR@/mono/1.0/mcs.exe')}</attribute>
<attribute name="managed">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -1550,7 +1550,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, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="managed">true</attribute>
</task>
<task name="resgen">
@@ -1576,15 +1576,15 @@
description="Mono 2.0 Profile"
sdkdirectory="${toolDirectory}"
frameworkdirectory="${toolDirectory}"
- frameworkassemblydirectory="${path::combine(prefix, 'lib/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/common/2.0" />
- <directory name="lib/common/neutral" />
+ <directory name="@LIBDIR@/mono/2.0" />
+ <directory name="@LIBDIR@/mono/neutral" />
+ <directory name="@LIBDIR@/common/2.0" />
+ <directory name="@LIBDIR@/common/neutral" />
</probing-paths>
<modes>
<auto>
@@ -1597,7 +1597,7 @@
</strict>
</modes>
</runtime>
- <reference-assemblies basedir="${path::combine(prefix, 'lib/mono/2.0')}">
+ <reference-assemblies basedir="${path::combine(prefix, '@LIBDIR@/mono/2.0')}">
<include name="*.dll" />
</reference-assemblies>
<task-assemblies>
@@ -1610,7 +1610,7 @@
</task-assemblies>
<tool-paths>
<directory name="${toolDirectory}" />
- <directory name="${path::combine(prefix, 'lib/mono/1.0')}" />
+ <directory name="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
</tool-paths>
<project>
<if test="${not pkg-config::exists('mono')}">
@@ -1624,7 +1624,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, '@LIBDIR@/mono/2.0')}" />
<property name="resgen.tool" value="resgen" />
<property name="csc.supportsdocgeneration" value="true" />
</if>
@@ -1680,15 +1680,15 @@
description="Mono 3.5 Profile"
sdkdirectory="${toolDirectory}"
frameworkdirectory="${toolDirectory}"
- frameworkassemblydirectory="${path::combine(prefix, 'lib/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/common/2.0" />
- <directory name="lib/common/neutral" />
+ <directory name="@LIBDIR@/mono/2.0" />
+ <directory name="@LIBDIR@/mono/neutral" />
+ <directory name="@LIBDIR@/common/2.0" />
+ <directory name="@LIBDIR@/common/neutral" />
</probing-paths>
<modes>
<auto>
@@ -1701,13 +1701,13 @@
</strict>
</modes>
</runtime>
- <reference-assemblies basedir="${path::combine(prefix, 'lib/mono/3.5')}">
+ <reference-assemblies basedir="${path::combine(prefix, '@LIBDIR@/mono/3.5')}">
<include name="*.dll" />
</reference-assemblies>
- <reference-assemblies basedir="${path::combine(prefix, 'lib/mono/3.0')}">
+ <reference-assemblies basedir="${path::combine(prefix, '@LIBDIR@/mono/3.0')}">
<include name="*.dll" />
</reference-assemblies>
- <reference-assemblies basedir="${path::combine(prefix, 'lib/mono/2.0')}">
+ <reference-assemblies basedir="${path::combine(prefix, '@LIBDIR@/mono/2.0')}">
<include name="*.dll" />
</reference-assemblies>
<task-assemblies>
@@ -1720,8 +1720,8 @@
</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, '@LIBDIR@/mono/2.0')}" />
+ <directory name="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
</tool-paths>
<project>
<if test="${not pkg-config::exists('mono')}">
@@ -1729,7 +1729,7 @@
</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')}" />
+ <property name="toolDirectory" value="${path::combine(prefix, '@LIBDIR@/mono/3.5')}" />
</project>
<tasks>
<task name="al">
@@ -1791,7 +1791,7 @@
</auto>
</modes>
</runtime>
- <reference-assemblies basedir="${path::combine(prefix, 'lib/mono/2.1')}">
+ <reference-assemblies basedir="${path::combine(prefix, '@LIBDIR@/mono/2.1')}">
<include name="agclr.dll" />
<include name="Microsoft.VisualBasic.dll" />
<include name="mscorlib.dll" />
@@ -1814,15 +1814,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, '@LIBDIR@/mono/2.0')}" />
+ <directory name="${path::combine(prefix, '@LIBDIR@/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, '@LIBDIR@/mono/2.1')}" />
</project>
<tasks>
<task name="csc">
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nant/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 17 Dec 2006 14:56:54 -0000 1.3
+++ .cvsignore 24 Feb 2008 21:46:57 -0000 1.4
@@ -1 +1 @@
-nant-0.85-src.tar.gz
+nant-0.86-beta1-src.tar.gz
Index: nant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nant/devel/nant.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nant.spec 19 Feb 2008 18:57:38 -0000 1.12
+++ nant.spec 24 Feb 2008 21:46:57 -0000 1.13
@@ -5,12 +5,11 @@
Summary: NAnt is a build tool for Mono and .NET
Name: nant
-Version: 0.85
-Release: 18%{?dist}
-Source0: http://download.sourceforge.net/nant/%{name}-%{version}-src.tar.gz
+Version: 0.86
+Release: 1%{?dist}
+Source0: http://download.sourceforge.net/nant/%{name}-%{version}-beta1-src.tar.gz
Patch0: nant-build.patch
-Patch1: nant-app.patch
-Patch2: nant-core-task.patch
+Patch1: nant-0.86-app-libdir.patch
License: GPL
Group: Development/Tools
Url: http://nant.sourceforge.net/
@@ -18,7 +17,7 @@
BuildRequires: mono-devel
Requires(post): scrollkeeper
Requires(postun): scrollkeeper
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
+#ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
%description
NAnt is a free .NET build tool. In theory it is kind of like make
@@ -33,12 +32,11 @@
Documentation of nant
%prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}-beta1
sed -i -e "s/@LIBDIR@/%{mlib}/" %{PATCH1}
%patch1 -p1 -b .orig
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
@@ -79,6 +77,10 @@
%doc examples/* doc/help/*
%changelog
+* 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nant/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 17 Dec 2006 14:56:54 -0000 1.3
+++ sources 24 Feb 2008 21:46:57 -0000 1.4
@@ -1 +1 @@
-45ae065439b6cbc0e02051b855843f50 nant-0.85-src.tar.gz
+6e5e5ba4515bde5668c085807322a1f3 nant-0.86-beta1-src.tar.gz
--- nant-app.patch DELETED ---
--- nant-core-task.patch DELETED ---
More information about the fedora-extras-commits
mailing list