rpms/nant/devel nant.spec,1.23,1.24

[Tom Callaway]

Author: spot

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

Modified Files:
	nant.spec 
Log Message:
undo bootstrapping hack, we are bootstrapped. readd br on sharpcvslib


Index: nant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nant/devel/nant.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- nant.spec	24 Dec 2008 00:37:11 -0000	1.23
+++ nant.spec	24 Dec 2008 01:37:34 -0000	1.24
@@ -5,7 +5,7 @@
 Summary: NAnt is a build tool for Mono and .NET
 Name: nant
 Version: 0.85	
-Release: 22%{?dist}.1
+Release: 23%{?dist}
 Epoch: 1
 Source0: http://download.sourceforge.net/nant/%{name}-%{version}-src.tar.gz
 Patch0: nant-build.patch
@@ -18,7 +18,7 @@
 Url: http://nant.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: mono-devel, log4net, mono-nunit, mono-nunit22-devel
-BuildRequires: mono-ndoc-devel
+BuildRequires: mono-ndoc-devel, mono-sharpcvslib-devel
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc sparcv9 alpha
@@ -53,30 +53,32 @@
 sed -i 's/\r//' README.txt
 sed -i 's/\r//' doc/releasenotes.html
 # Clean out the prebuilt files
-# HACK: Don't delete anything until we can bootstrap
-# rm -rf lib/ICSharpCode.SharpCvsLib.Console.dll lib/ICSharpCode.SharpCvsLib.dll lib/scvs.exe
-# rm -rf lib/ICSharpCode.SharpZipLib.dll lib/NUnitCore.dll lib/log4net.dll lib/mono/1.0/*.dll lib/mono/2.0/*.dll
+# If you're bootstrapping, comment out these two rm lines
+# sharpcvslib bits
+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
 
 # Copy in the system libs
-# HACK: Leave this alone while bootstrapping
-# 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/
+# If you're bootstrapping, comment out all these cp lines
+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/
 
 %build
 export MONO_PATH=%{buildroot}/%{mlib}
@@ -90,10 +92,10 @@
 rm -rf %{buildroot}%{_datadir}/NAnt/doc
 
 # Flush out the binary bits that we used to build
-# HACK: Don't do this when we're bootstrapping
-# rm -rf %{buildroot}%{_libdir}/NAnt/bin/lib
-# rm -rf %{buildroot}%{_libdir}/NAnt/bin/log4net.dll
-# rm -rf %{buildroot}%{_libdir}/NAnt/bin/scvs.exe
+# If you're bootstrapping, comment out all these rm lines
+rm -rf %{buildroot}%{_libdir}/NAnt/bin/lib
+rm -rf %{buildroot}%{_libdir}/NAnt/bin/log4net.dll
+rm -rf %{buildroot}%{_libdir}/NAnt/bin/scvs.exe
 
 %clean
 rm -rf %{buildroot}
@@ -115,6 +117,10 @@
 %doc examples/* doc/help/*
 
 %changelog
+* Tue Dec 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:0.85-23
+- undo bootstrapping hack
+- readd BR mono-sharpcvslib-devel (yes, it is circular, mono is a mess)
+
 * Tue Dec 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:0.85-22.1
 - bootstrapping hack
 - don't monkey with patches, bad form