rpms/nant/F-9 nant.spec,1.21,1.22

Tom Callaway (spot) fedora-extras-commits at redhat.com
Wed Apr 23 02:21:15 UTC 2008


Author: spot

Update of /cvs/pkgs/rpms/nant/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26793

Modified Files:
	nant.spec 
Log Message:
more bootstrap hack


Index: nant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nant/F-9/nant.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nant.spec	23 Apr 2008 02:10:14 -0000	1.21
+++ nant.spec	23 Apr 2008 02:20:31 -0000	1.22
@@ -1,13 +1,13 @@
 %define debug_package %{nil}
 %define monodir %{_libdir}
 %define mlib %{_lib}
-# If we're bootstrapping, set this to 1.
-%define bootstrap 1
+# If we're not bootstrapping, set this to 1.
+%define nobootstrap 0
 
 Summary: NAnt is a build tool for Mono and .NET
 Name: nant
 Version: 0.85	
-Release: 20%{?dist}.1
+Release: 20%{?dist}.2
 Epoch: 1
 Source0: http://download.sourceforge.net/nant/%{name}-%{version}-src.tar.gz
 Patch0: nant-build.patch
@@ -19,8 +19,11 @@
 Group: Development/Tools
 Url: http://nant.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: mono-devel, mono-sharpcvslib-devel, log4net, mono-nunit, mono-nunit22-devel
+BuildRequires: mono-devel 
+%if 0%{nobootstrap}
+BuildRequires: mono-sharpcvslib-devel, log4net, mono-nunit, mono-nunit22-devel
 BuildRequires: mono-ndoc-devel
+%endif
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc sparcv9 alpha
@@ -45,7 +48,7 @@
 %patch0 -p1 -b .orig
 %patch2 -p1 -b .orig
 %patch3 -p1 -b .orig
-%if 0%{bootstrap}
+%if 0%{nobootstrap}
 %patch4 -p1 -b .system
 %endif
 sed -i -e "s/@LIB@/%{_lib}/" NAnt.build
@@ -56,7 +59,7 @@
 sed -i 's/\r//' COPYING.txt
 sed -i 's/\r//' README.txt
 sed -i 's/\r//' doc/releasenotes.html
-%if 0%{bootstrap}
+%if 0%{nobootstrap}
 # Clean out the prebuilt files
 rm -rf lib/*.dll lib/*.exe lib/mono/1.0/*.dll lib/mono/2.0/*.dll
 
@@ -92,7 +95,7 @@
 find examples -name \*.dll -o -name \*.exe|xargs rm -f
 rm -rf %{buildroot}%{_datadir}/NAnt/doc
 
-%if 0%{bootstrap}
+%if 0%{nobootstrap}
 # Flush out the binary bits that we used to build
 rm -rf %{buildroot}%{_libdir}/NAnt/bin/lib
 rm -rf %{buildroot}%{_libdir}/NAnt/bin/log4net.dll
@@ -119,6 +122,9 @@
 %doc examples/* doc/help/*
 
 %changelog
+* Mon Apr 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:0.85-20.2
+- bootstrap hack continues
+
 * Mon Apr 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:0.85-20.1
 - bootstrap hack
 




More information about the fedora-extras-commits mailing list