rpms/nant/devel nant-core-task.patch,NONE,1.1 nant.spec,1.8,1.9

[Paul F. Johnson (pfj)]

Author: pfj

Update of /cvs/extras/rpms/nant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32014/devel

Modified Files:
	nant.spec 
Added Files:
	nant-core-task.patch 
Log Message:

Removed support for fc5 and 6, fixed small code error 


nant-core-task.patch:

--- NEW FILE nant-core-task.patch ---
--- nant-0.85/src/NAnt.Core/Task.cs	2005-10-21 18:13:06.000000000 +0100
+++ nant-0.85/src/NAnt.Core/Task.cs.new	2007-11-12 13:13:05.000000000 +0000
@@ -400,7 +400,7 @@
         #region Protected Instance Methods
 
         /// <summary><note>Deprecated (to be deleted).</note></summary>
-        [Obsolete("Deprecated- Use InitializeTask instead")]
+        //[Obsolete("Deprecated- Use InitializeTask instead")]
         protected override void InitializeElement(XmlNode elementNode) {
             // Just defer for now so that everything just works
             InitializeTask(elementNode);
@@ -415,4 +415,4 @@
 
         #endregion Protected Instance Methods
     }
-}
\ No newline at end of file
+}


Index: nant.spec
===================================================================
RCS file: /cvs/extras/rpms/nant/devel/nant.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nant.spec	27 Dec 2006 18:49:26 -0000	1.8
+++ nant.spec	12 Nov 2007 13:56:03 -0000	1.9
@@ -1,20 +1,16 @@
 %define debug_package %{nil}
 
-%if "%{?fedora}" == "5"
-%define monodir %{_prefix}/lib
-%define mlib lib
-%else
 %define monodir %{_libdir}
 %define mlib %{_lib}
-%endif
 
 Summary: NAnt is a build tool for Mono and .NET
 Name: nant
 Version: 0.85	
-Release: 12%{?dist}
+Release: 15%{?dist}
 Source0: http://download.sourceforge.net/nant/%{name}-%{version}-src.tar.gz
 Patch0: nant-build.patch
 Patch1: nant-app.patch
+Patch2: nant-core-task.patch
 License: GPL
 Group: Development/Tools
 Url: http://nant.sourceforge.net/
@@ -37,12 +33,11 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%if "%{?fedora}" > "5"
 sed -i -e "s/@LIBDIR@/%{mlib}/" %{PATCH1}
 %patch1 -p1 -b .orig
 sed -i -e "s/%{mlib}/@LIBDIR@/" %{PATCH1}
-%endif
 %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
@@ -83,8 +78,9 @@
 %doc examples/* doc/help/*
 
 %changelog
-* Wed Dec 27 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.85-12
-- rebuild for boo
+* Mon Nov 12 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.85.15
+- removed fc5 and fc6 support
+- fixed small errors in the code base
 
 * Sun Dec 17 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.85-11
 - No longer the RC release