rpms/nant/devel nant.spec,1.27,1.28

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/nant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17298

Modified Files:
	nant.spec 
Log Message:
bootstrap hack


Index: nant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nant/devel/nant.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- nant.spec	2 Mar 2009 16:15:16 -0000	1.27
+++ nant.spec	2 Mar 2009 16:22:15 -0000	1.28
@@ -1,11 +1,12 @@
-%define debug_package %{nil}
-%define monodir %{_libdir}
-%define mlib %{_lib}
+%global debug_package %{nil}
+%global monodir %{_libdir}
+%global mlib %{_lib}
+%global bootstrap 1
 
 Summary: NAnt is a build tool for Mono and .NET
 Name: nant
 Version: 0.85	
-Release: 25%{?dist}
+Release: 25%{?dist}.1
 Epoch: 1
 Source0: http://download.sourceforge.net/nant/%{name}-%{version}-src.tar.gz
 Patch0: nant-build.patch
@@ -52,33 +53,38 @@
 sed -i 's/\r//' COPYING.txt
 sed -i 's/\r//' README.txt
 sed -i 's/\r//' doc/releasenotes.html
-# Clean out the prebuilt files
-# If you're bootstrapping, comment out these two rm lines
-# sharpcvslib bits
+
+# Clean out the prebuilt files (unless we're bootstrapping)
+%if 0%{bootstrap}
+echo "NORMAL BUILD"
+%else
+echo "BOOTSTRAPPING BUILD"
 rm -rf lib/ICSharpCode.SharpCvsLib.Console.dll lib/ICSharpCode.SharpCvsLib.dll lib/scvs.exe
-# other system lib bits
 rm -rf lib/ICSharpCode.SharpZipLib.dll lib/NUnitCore.dll lib/log4net.dll lib/mono/1.0/*.dll lib/mono/2.0/*.dll
+%endif
 
 # Copy in the system libs
 # If you're bootstrapping, comment out all these cp lines
+%if 0%{bootstrap}
+# do nothing
+%else
 cp -p %{_libdir}/mono/sharpcvslib/ICSharpCode.SharpCvsLib.dll lib/
 cp -p %{_libdir}/mono/sharpcvslib/cvs.exe lib/scvs.exe
 cp -p %{_libdir}/mono/1.0/ICSharpCode.SharpZipLib.dll lib/
 cp -p %{_libdir}/mono/log4net/log4net.dll lib/
-
 cp -p %{_libdir}/mono/ndoc/NDoc.Core.dll lib/mono/1.0/
 cp -p %{_libdir}/mono/ndoc/NDoc.Documenter.Msdn.dll lib/mono/1.0/
 cp -p %{_libdir}/mono/ndoc/NDoc.ExtendedUI.dll lib/mono/1.0/
 cp -p %{_libdir}/mono/1.0/nunit.core.dll lib/mono/1.0/
 cp -p %{_libdir}/mono/1.0/nunit.framework.dll lib/mono/1.0/
 cp -p %{_libdir}/mono/1.0/nunit.util.dll lib/mono/1.0/
-
 cp -p %{_libdir}/mono/ndoc/NDoc.Core.dll lib/mono/2.0/
 cp -p %{_libdir}/mono/ndoc/NDoc.Documenter.Msdn.dll lib/mono/2.0/
 cp -p %{_libdir}/mono/ndoc/NDoc.ExtendedUI.dll lib/mono/2.0/
 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}
@@ -93,9 +99,13 @@
 
 # Flush out the binary bits that we used to build
 # If you're bootstrapping, comment out all these rm lines
+%if 0%{bootstrap}
+# Do nothing
+%else
 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}
@@ -117,8 +127,8 @@
 %doc examples/* doc/help/*
 
 %changelog
-* Mon Mar  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:0.85-25
-- undo bootstrapping hack
+* Mon Mar  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:0.85-25.1
+- proper conditionals for bootstrapping
 
 * Mon Mar  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:0.85-24.1
 - bootstrap hack (to recover from mass rebuild)