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

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	nant.spec 
Log Message:
bootstrap hack


Index: nant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nant/F-9/nant.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nant.spec	13 Apr 2008 01:24:36 -0000	1.20
+++ nant.spec	23 Apr 2008 02:10:14 -0000	1.21
@@ -1,11 +1,13 @@
 %define debug_package %{nil}
 %define monodir %{_libdir}
 %define mlib %{_lib}
+# If we're bootstrapping, set this to 1.
+%define bootstrap 1
 
 Summary: NAnt is a build tool for Mono and .NET
 Name: nant
 Version: 0.85	
-Release: 20%{?dist}
+Release: 20%{?dist}.1
 Epoch: 1
 Source0: http://download.sourceforge.net/nant/%{name}-%{version}-src.tar.gz
 Patch0: nant-build.patch
@@ -43,7 +45,9 @@
 %patch0 -p1 -b .orig
 %patch2 -p1 -b .orig
 %patch3 -p1 -b .orig
+%if 0%{bootstrap}
 %patch4 -p1 -b .system
+%endif
 sed -i -e "s/@LIB@/%{_lib}/" NAnt.build
 sed -i -e "s!@BUILDROOT@!%{buildroot}/usr!" NAnt.build
 find . -type d|xargs chmod 755
@@ -52,6 +56,7 @@
 sed -i 's/\r//' COPYING.txt
 sed -i 's/\r//' README.txt
 sed -i 's/\r//' doc/releasenotes.html
+%if 0%{bootstrap}
 # Clean out the prebuilt files
 rm -rf lib/*.dll lib/*.exe lib/mono/1.0/*.dll lib/mono/2.0/*.dll
 
@@ -74,6 +79,7 @@
 cp -p %{_libdir}/mono/nunit22/nunit.core.dll lib/mono/2.0/
 cp -p %{_libdir}/mono/nunit22/nunit.framework.dll lib/mono/2.0/
 cp -p %{_libdir}/mono/nunit22/nunit.util.dll lib/mono/2.0/
+%endif
 
 %build
 export MONO_PATH=%{buildroot}/%{mlib}
@@ -86,10 +92,12 @@
 find examples -name \*.dll -o -name \*.exe|xargs rm -f
 rm -rf %{buildroot}%{_datadir}/NAnt/doc
 
+%if 0%{bootstrap}
 # 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
 rm -rf %{buildroot}%{_libdir}/NAnt/bin/scvs.exe
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -111,6 +119,9 @@
 %doc examples/* doc/help/*
 
 %changelog
+* Mon Apr 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:0.85-20.1
+- bootstrap hack
+
 * Mon Apr 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:0.85-20
 - don't use prebuilt binary bits