rpms/nant/devel nant-core-task.patch,1.2,1.3 nant.spec,1.18,1.19

[Alex Lancaster (alexlan)]

Author: alexlan

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

Modified Files:
	nant.spec 
Added Files:
	nant-core-task.patch 
Log Message:
Really try to revert to pre-0.86 patches and spec.


nant-core-task.patch:

Index: nant-core-task.patch
===================================================================
RCS file: nant-core-task.patch
diff -N nant-core-task.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nant-core-task.patch	8 Apr 2008 12:22:37 -0000	1.3
@@ -0,0 +1,18 @@
+--- 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/pkgs/rpms/nant/devel/nant.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nant.spec	8 Apr 2008 02:00:30 -0000	1.18
+++ nant.spec	8 Apr 2008 12:22:37 -0000	1.19
@@ -10,7 +10,8 @@
 Source0: http://download.sourceforge.net/nant/%{name}-%{version}-src.tar.gz
 Patch0: nant-build.patch
 Patch1: nant-app.patch
-Patch2: nant-0.85-api.patch
+Patch2: nant-core-task.patch
+Patch3: nant-0.85-api.patch
 License: GPL
 Group: Development/Tools
 Url: http://nant.sourceforge.net/
@@ -39,6 +40,7 @@
 sed -i -e "s/%{mlib}/@LIBDIR@/" %{PATCH1}
 %patch0 -p1 -b .orig
 %patch2 -p1 -b .orig
+%patch3 -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