rpms/mono-nunit22/devel import.log, NONE, 1.1 mono-nunit22-248-buildkey.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mono-nunit22.spec, 1.6, 1.7 sources, 1.2, 1.3 nunit22-key.patch, 1.1, NONE nunit22-mono.patch, 1.1, NONE

Thu Dec 18 12:32:35 UTC 2008

Author: pfj

Update of /cvs/pkgs/rpms/mono-nunit22/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14702/devel

Modified Files:
	.cvsignore mono-nunit22.spec sources 
Added Files:
	import.log mono-nunit22-248-buildkey.patch 
Removed Files:
	nunit22-key.patch nunit22-mono.patch 
Log Message:

Bump to 2.4.8
Removed nunit22 build patch
Fixed signing key patch
Spec file fix

--- NEW FILE import.log ---
mono-nunit22-2_4_8-1_fc11:HEAD:mono-nunit22-2.4.8-1.fc11.src.rpm:1229603414

mono-nunit22-248-buildkey.patch:

--- NEW FILE mono-nunit22-248-buildkey.patch ---
--- mono-nunit22-2.4.8/src/ClientUtilities/util/nunit.util.build	2008-03-12 21:57:52.000000000 +0000
+++ mono-nunit22-2.4.8/src/ClientUtilities/util/nunit.util.build-new	2008-11-30 20:00:20.000000000 +0000
@@ -4,7 +4,7 @@
   <target name="build">
     <csc target="library" 
         output="${current.build.dir}/nunit.util.dll"
-        debug="${build.debug}" define="${build.defines}">
+        debug="${build.debug}" define="${build.defines}" keyfile="../../../nunit.snk">
       <sources>
         <include name="AggregatingTestRunner.cs"/>
         <include name="AssemblyInfo.cs"/>
--- mono-nunit22-2.4.8/src/ConsoleRunner/nunit-console-exe/nunit-console.exe.build	2007-09-18 06:18:42.000000000 +0100
+++ mono-nunit22-2.4.8/src/ConsoleRunner/nunit-console-exe/nunit-console.exe.build-new	2008-11-30 20:01:36.000000000 +0000
@@ -4,7 +4,7 @@
   <target name="build">
     <csc target="exe" 
         output="${current.build.dir}/${nunit.console.name}"
-        debug="${build.debug}" define="${build.defines}">
+        debug="${build.debug}" define="${build.defines}" keyfile="../../../nunit.snk">
       <sources>
         <include name="AssemblyInfo.cs"/>
         <include name="Class1.cs"/>
--- mono-nunit22-2.4.8/src/ConsoleRunner/nunit-console/nunit-console.build	2008-03-12 21:57:36.000000000 +0000
+++ mono-nunit22-2.4.8/src/ConsoleRunner/nunit-console/nunit-console.build-new	2008-11-30 20:02:17.000000000 +0000
@@ -4,7 +4,7 @@
   <target name="build">
     <csc target="library" 
         output="${current.build.dir}/nunit-console-runner.dll"
-        debug="${build.debug}" define="${build.defines}">
+        debug="${build.debug}" define="${build.defines}" keyfile="../../../nunit.snk">
       <sources>
         <include name="AssemblyInfo.cs"/>
         <include name="ConsoleOptions.cs"/>
--- mono-nunit22-2.4.8/src/GuiComponents/UiKit/nunit.uikit.build	2008-03-12 21:57:00.000000000 +0000
+++ mono-nunit22-2.4.8/src/GuiComponents/UiKit/nunit.uikit.build-new	2008-11-30 20:02:56.000000000 +0000
@@ -4,7 +4,7 @@
   <target name="build">
     <csc target="library" 
     output="${current.build.dir}/nunit.uikit.dll"
-    debug="${build.debug}" define="${build.defines}">
+    debug="${build.debug}" define="${build.defines}" keyfile="../../../nunit.snk">
       <sources>
         <include name="AddConfigurationDialog.cs"/>
         <include name="AddTabPageDialog.cs"/>
@@ -108,4 +108,4 @@
     </copy>
   </target>
 
-</project>
\ No newline at end of file
+</project>
--- mono-nunit22-2.4.8/src/GuiRunner/nunit-gui-exe/nunit-gui.exe.build	2007-09-18 06:18:58.000000000 +0100
+++ mono-nunit22-2.4.8/src/GuiRunner/nunit-gui-exe/nunit-gui.exe.build-new	2008-11-30 20:03:47.000000000 +0000
@@ -5,7 +5,7 @@
     <csc target="winexe" 
         output="${current.build.dir}/${nunit.gui.name}" 
         win32icon="App.ico" debug="${build.debug}"
-        define="${build.defines}">
+        define="${build.defines}" keyfile="../../../nunit.snk">
       <sources>
         <include name="AssemblyInfo.cs"/>
         <include name="Class1.cs"/>
@@ -44,4 +44,4 @@
     </copy>
   </target>
 
-</project>
\ No newline at end of file
+</project>
--- mono-nunit22-2.4.8/src/GuiRunner/nunit-gui/nunit-gui.build	2008-03-12 21:56:38.000000000 +0000
+++ mono-nunit22-2.4.8/src/GuiRunner/nunit-gui/nunit-gui.build-new	2008-11-30 20:04:15.000000000 +0000
@@ -5,7 +5,7 @@
     <csc target="library" 
        output="${current.build.dir}/nunit-gui-runner.dll" 
        win32icon="Logo.ico" debug="${build.debug}"
-       define="${build.defines}">
+       define="${build.defines}" keyfile="../../../nunit.snk">
       <sources>
         <include name="AboutBox.cs"/>
         <include name="AddinDialog.cs"/>
@@ -64,4 +64,4 @@
     </copy>
   </target>
 
-</project>
\ No newline at end of file
+</project>
--- mono-nunit22-2.4.8/src/NUnitExtensions/core/nunit.core.extensions.build	2008-03-28 21:48:36.000000000 +0000
+++ mono-nunit22-2.4.8/src/NUnitExtensions/core/nunit.core.extensions.build-new	2008-11-30 20:05:04.000000000 +0000
@@ -4,7 +4,7 @@
   <target name="build">
     <csc target="library" 
         output="${current.build.dir}/nunit.core.extensions.dll"
-        debug="${build.debug}" define="${build.defines}">
+        debug="${build.debug}" define="${build.defines}" keyfile="../../../nunit.snk">
       <sources>
         <include name="AssemblyInfo.cs"/>
         <include name="RepeatedTestCase.cs"/>
@@ -28,4 +28,4 @@
     </copy>
   </target>
 
-</project>
\ No newline at end of file
+</project>
--- mono-nunit22-2.4.8/src/NUnitFramework/framework/nunit.framework.build	2007-09-20 08:35:28.000000000 +0100
+++ mono-nunit22-2.4.8/src/NUnitFramework/framework/nunit.framework-new.build	2008-11-30 20:06:54.000000000 +0000
@@ -7,7 +7,7 @@
         doc="${current.build.dir}/nunit.framework.xml"
         debug="${build.debug}" 
         define="${build.defines}">
-      <nowarn>
+      <nowarn keyfile="../../../nunit.snk">
         <warning number="618,672"/>
         <warning number="1699" if="${runtime.version=='2.0'}"/>
       </nowarn>
@@ -76,4 +76,4 @@
     </copy>
   </target>
 
-</project>
\ No newline at end of file
+</project>
--- mono-nunit22-2.4.8/src/NUnitMocks/mocks/nunit.mocks.build	2007-02-08 19:21:18.000000000 +0000
+++ mono-nunit22-2.4.8/src/NUnitMocks/mocks/nunit.mocks-new.build	2008-11-30 20:07:28.000000000 +0000
@@ -4,7 +4,7 @@
   <target name="build">
     <csc target="library" 
         output="${current.build.dir}/nunit.mocks.dll"
-        debug="${build.debug}" define="${build.defines}">
+        debug="${build.debug}" define="${build.defines}" keyfile="../../../nunit.snk">
       <sources>
         <include name="AssemblyInfo.cs"/>
         <include name="DynamicMock.cs"/>
@@ -35,4 +35,4 @@
     </copy>
   </target>
 
-</project>
\ No newline at end of file
+</project>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-nunit22/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Apr 2008 15:55:19 -0000	1.2
+++ .cvsignore	18 Dec 2008 12:32:05 -0000	1.3
@@ -1 +1 @@
-NUnit-2.2.10-src.zip
+NUnit-2.4.8-src.zip


Index: mono-nunit22.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-nunit22/devel/mono-nunit22.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mono-nunit22.spec	11 Aug 2008 15:22:02 -0000	1.6
+++ mono-nunit22.spec	18 Dec 2008 12:32:05 -0000	1.7
@@ -1,23 +1,22 @@
 %define debug_package %{nil}
 
 Name:	 	mono-nunit22
-Version:	2.2.10
-Release:	7%{?dist}
+Version:	2.4.8
+Release:	1%{?dist}
 Summary:	Unit-testing framework for .NET
 URL:		http://www.nunit.org/
-License:	MIT with advertising
+License:	MIT with acknowledgement
 Group:		System Environment/Libraries
-Source0:	http://downloads.sourceforge.net/nunit/NUnit-2.2.10-src.zip
+Source0:	http://downloads.sourceforge.net/nunit/NUnit-2.4.8-src.zip
 Source1:	nunit22.pc
-Patch0:		nunit22-mono.patch
-Patch1:		nunit22-key.patch
+Patch0:		mono-nunit22-248-buildkey.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires:	mono-devel, nant
+BuildRequires:	mono-devel >= 2.2 , nant
 BuildRequires:	unzip
 # There is no nant for ppc/ppc64
 ExcludeArch:	ppc64 ppc
 
-%description
+%description 
 NUnit is a unit-testing framework for all .Net languages. Initially ported from
 JUnit, this xUnit based unit testing tool is written entirely in C# and has 
 been completely redesigned to take advantage of many .NET language features, 
@@ -35,8 +34,7 @@
 
 %prep
 %setup -q -c -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1 -b .key
+%patch0 -p1 -b .key
 
 %build
 sn -k nunit.snk
@@ -49,9 +47,8 @@
 nant mono-2.0 copy-bins
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 cp -p %{S:1} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
-sed -i -e 's!@libdir@!%{_libdir}!' $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nunit22.pc
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/mono/gac/
-cd package/NUnit-%{version}
+cd ../package/NUnit-%{version}
 gacutil -i bin/nunit-console.exe -f -package nunit22 -root ${RPM_BUILD_ROOT}/%{_libdir}
 gacutil -i bin/nunit-console-runner.dll -f -package nunit22 -root ${RPM_BUILD_ROOT}/%{_libdir}
 gacutil -i bin/nunit.core.dll -f -package nunit22 -root ${RPM_BUILD_ROOT}/%{_libdir}
@@ -75,17 +72,11 @@
 
 
 %changelog
-* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-7
-- fix license tag
-
-* Thu Jun  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-6
-- rebuild for new mono bits
-
-* Tue Apr 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-5
-- fix sed invocation
-
-* Tue Apr 22 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2.10-4
-- fix for incorrect libdir in pc file
+* Sun Nov 30 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.8-1
+- bump to bring it up to date
+- remove nunit22 build patch
+- fix new nunit22 key patch
+- spec file fix
 
 * Fri Apr 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.2.10-3
 - no nant for ppc ppc64


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-nunit22/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Apr 2008 15:55:19 -0000	1.2
+++ sources	18 Dec 2008 12:32:05 -0000	1.3
@@ -1 +1 @@
-21f03da90e34d2eb36e9445c816f53c5  NUnit-2.2.10-src.zip
+460d0c283ae814f76d789b3fb10be647  NUnit-2.4.8-src.zip


--- nunit22-key.patch DELETED ---


--- nunit22-mono.patch DELETED ---


