rpms/mono-nunit22/devel nunit22-key.patch, 1.2, 1.3 nunit22-mono.patch, 1.2, 1.3 mono-nunit22.spec, 1.10, 1.11 sources, 1.3, 1.4
Tom Callaway
spot at fedoraproject.org
Tue Mar 3 20:26:05 UTC 2009
Author: spot
Update of /cvs/pkgs/rpms/mono-nunit22/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17774
Modified Files:
mono-nunit22.spec sources
Added Files:
nunit22-key.patch nunit22-mono.patch
Log Message:
revert to 2.2.10, bump epoch
nunit22-key.patch:
Index: nunit22-key.patch
===================================================================
RCS file: nunit22-key.patch
diff -N nunit22-key.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nunit22-key.patch 3 Mar 2009 20:26:04 -0000 1.3
@@ -0,0 +1,120 @@
+diff -up mono-nunit22-2.2.10/src/ClientUtilities/util/nunit.util.build.key mono-nunit22-2.2.10/src/ClientUtilities/util/nunit.util.build
+--- mono-nunit22-2.2.10/src/ClientUtilities/util/nunit.util.build.key 2008-04-11 10:15:09.000000000 -0400
++++ mono-nunit22-2.2.10/src/ClientUtilities/util/nunit.util.build 2008-04-11 10:15:34.000000000 -0400
+@@ -8,7 +8,7 @@
+ <target name="build" depends="make-build-dir">
+ <csc target="library"
+ output="${current.build.dir}/${current.build.output}.dll"
+- debug="${build.debug}" define="${build.defines.csc}">
++ debug="${build.debug}" define="${build.defines.csc}" keyfile="../../../nunit.snk">
+ <sources basedir=".">
+ <include name="*.cs"/>
+ <include name="../../CommonAssemblyInfo.cs"/>
+diff -up mono-nunit22-2.2.10/src/ConsoleRunner/nunit-console-exe/nunit-console.exe.build.key mono-nunit22-2.2.10/src/ConsoleRunner/nunit-console-exe/nunit-console.exe.build
+--- mono-nunit22-2.2.10/src/ConsoleRunner/nunit-console-exe/nunit-console.exe.build.key 2008-04-11 10:15:44.000000000 -0400
++++ mono-nunit22-2.2.10/src/ConsoleRunner/nunit-console-exe/nunit-console.exe.build 2008-04-11 10:16:06.000000000 -0400
+@@ -9,7 +9,7 @@
+ <target name="build" depends="make-build-dir">
+ <csc target="exe"
+ output="${current.build.dir}/nunit-console.exe"
+- debug="${build.debug}" define="${build.defines.csc}">
++ debug="${build.debug}" define="${build.defines.csc}" keyfile="../../../nunit.snk">
+ <sources basedir=".">
+ <include name="*.cs"/>
+ </sources>
+diff -up mono-nunit22-2.2.10/src/ConsoleRunner/nunit-console/nunit-console.build.key mono-nunit22-2.2.10/src/ConsoleRunner/nunit-console/nunit-console.build
+--- mono-nunit22-2.2.10/src/ConsoleRunner/nunit-console/nunit-console.build.key 2008-04-11 10:16:16.000000000 -0400
++++ mono-nunit22-2.2.10/src/ConsoleRunner/nunit-console/nunit-console.build 2008-04-11 10:16:34.000000000 -0400
+@@ -9,7 +9,7 @@
+ <target name="build" depends="make-build-dir">
+ <csc target="library"
+ output="${current.build.dir}/nunit-console-runner.dll"
+- debug="${build.debug}" define="${build.defines.csc}">
++ debug="${build.debug}" define="${build.defines.csc}" keyfile="../../../nunit.snk">
+ <sources basedir=".">
+ <include name="*.cs"/>
+ <include name="../../CommonAssemblyInfo.cs"/>
+diff -up mono-nunit22-2.2.10/src/GuiComponents/UiKit/nunit.uikit.build.key mono-nunit22-2.2.10/src/GuiComponents/UiKit/nunit.uikit.build
+--- mono-nunit22-2.2.10/src/GuiComponents/UiKit/nunit.uikit.build.key 2008-04-11 10:16:50.000000000 -0400
++++ mono-nunit22-2.2.10/src/GuiComponents/UiKit/nunit.uikit.build 2008-04-11 10:17:09.000000000 -0400
+@@ -8,7 +8,7 @@
+ <target name="build" depends="make-build-dir">
+ <csc target="library"
+ output="${current.build.dir}/nunit.uikit.dll"
+- debug="${build.debug}" define="${build.defines.csc}">
++ debug="${build.debug}" define="${build.defines.csc}" keyfile="../../../nunit.snk">
+ <sources basedir=".">
+ <include name="*.cs"/>
+ <include name="../../CommonAssemblyInfo.cs"/>
+diff -up mono-nunit22-2.2.10/src/GuiRunner/nunit-gui-exe/nunit-gui.exe.build.key mono-nunit22-2.2.10/src/GuiRunner/nunit-gui-exe/nunit-gui.exe.build
+--- mono-nunit22-2.2.10/src/GuiRunner/nunit-gui-exe/nunit-gui.exe.build.key 2008-04-11 10:17:20.000000000 -0400
++++ mono-nunit22-2.2.10/src/GuiRunner/nunit-gui-exe/nunit-gui.exe.build 2008-04-11 10:17:37.000000000 -0400
+@@ -10,7 +10,7 @@
+ <csc target="winexe"
+ output="${current.build.dir}/nunit-gui.exe"
+ win32icon="App.ico" debug="${build.debug}"
+- define="${build.defines.csc}">
++ define="${build.defines.csc}" keyfile="../../../nunit.snk">
+ <sources basedir=".">
+ <include name="AssemblyInfo.cs"/>
+ <include name="Class1.cs"/>
+diff -up mono-nunit22-2.2.10/src/GuiRunner/nunit-gui/nunit-gui.build.key mono-nunit22-2.2.10/src/GuiRunner/nunit-gui/nunit-gui.build
+--- mono-nunit22-2.2.10/src/GuiRunner/nunit-gui/nunit-gui.build.key 2008-04-11 10:17:56.000000000 -0400
++++ mono-nunit22-2.2.10/src/GuiRunner/nunit-gui/nunit-gui.build 2008-04-11 10:18:18.000000000 -0400
+@@ -9,7 +9,7 @@
+ <csc target="library"
+ output="${current.build.dir}/nunit-gui-runner.dll"
+ win32icon="Logo.ico" debug="${build.debug}"
+- define="${build.defines.csc}">
++ define="${build.defines.csc}" keyfile="../../../nunit.snk">
+ <sources basedir=".">
+ <include name="*.cs"/>
+ <include name="../../CommonAssemblyInfo.cs"/>
+diff -up mono-nunit22-2.2.10/src/NUnitExtensions/core/nunit.core.extensions.build.key mono-nunit22-2.2.10/src/NUnitExtensions/core/nunit.core.extensions.build
+--- mono-nunit22-2.2.10/src/NUnitExtensions/core/nunit.core.extensions.build.key 2008-04-11 10:19:45.000000000 -0400
++++ mono-nunit22-2.2.10/src/NUnitExtensions/core/nunit.core.extensions.build 2008-04-11 10:20:03.000000000 -0400
+@@ -9,7 +9,7 @@
+ <target name="build" depends="make-build-dir">
+ <csc target="library"
+ output="${current.build.dir}/nunit.core.extensions.dll"
+- debug="${build.debug}" define="${build.defines.csc}">
++ debug="${build.debug}" define="${build.defines.csc}" keyfile="../../../nunit.snk">
+ <sources basedir=".">
+ <include name="*.cs"/>
+ <include name="../../CommonAssemblyInfo.cs"/>
+diff -up mono-nunit22-2.2.10/src/NUnitFramework/core/nunit.core.build.key mono-nunit22-2.2.10/src/NUnitFramework/core/nunit.core.build
+--- mono-nunit22-2.2.10/src/NUnitFramework/core/nunit.core.build.key 2008-04-11 10:18:35.000000000 -0400
++++ mono-nunit22-2.2.10/src/NUnitFramework/core/nunit.core.build 2008-04-11 10:19:06.000000000 -0400
+@@ -9,7 +9,7 @@
+ <csc target="library"
+ output="${current.build.dir}/nunit.core.dll"
+ debug="${build.debug}"
+- define="${build.defines.csc},StronglyNamedAssembly">
++ define="${build.defines.csc},StronglyNamedAssembly" keyfile="../../../nunit.snk">
+ <sources basedir=".">
+ <include name="*.cs"/>
+ <include name="../../CommonAssemblyInfo.cs"/>
+diff -up mono-nunit22-2.2.10/src/NUnitFramework/framework/nunit.framework.build.key mono-nunit22-2.2.10/src/NUnitFramework/framework/nunit.framework.build
+--- mono-nunit22-2.2.10/src/NUnitFramework/framework/nunit.framework.build.key 2008-04-11 10:20:35.000000000 -0400
++++ mono-nunit22-2.2.10/src/NUnitFramework/framework/nunit.framework.build 2008-04-11 10:20:50.000000000 -0400
+@@ -10,7 +10,7 @@
+ output="${current.build.dir}/nunit.framework.dll"
+ debug="${build.debug}"
+ define="${build.defines.csc},StronglyNamedAssembly"
+- nowarn="618,672">
++ nowarn="618,672" keyfile="../../../nunit.snk">
+ <sources basedir=".">
+ <include name="*.cs"/>
+ <include name="../../CommonAssemblyInfo.cs"/>
+diff -up mono-nunit22-2.2.10/src/NUnitMocks/mocks/nunit.mocks.build.key mono-nunit22-2.2.10/src/NUnitMocks/mocks/nunit.mocks.build
+--- mono-nunit22-2.2.10/src/NUnitMocks/mocks/nunit.mocks.build.key 2008-04-11 10:21:13.000000000 -0400
++++ mono-nunit22-2.2.10/src/NUnitMocks/mocks/nunit.mocks.build 2008-04-11 10:21:29.000000000 -0400
+@@ -8,7 +8,7 @@
+ <target name="build" depends="make-build-dir">
+ <csc target="library"
+ output="${current.build.dir}/nunit.mocks.dll"
+- debug="${build.debug}" define="${build.defines.csc}">
++ debug="${build.debug}" define="${build.defines.csc}" keyfile="../../../nunit.snk">
+ <sources basedir=".">
+ <include name="../../CommonAssemblyInfo.cs"/>
+ <include name="*.cs"/>
nunit22-mono.patch:
Index: nunit22-mono.patch
===================================================================
RCS file: nunit22-mono.patch
diff -N nunit22-mono.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nunit22-mono.patch 3 Mar 2009 20:26:04 -0000 1.3
@@ -0,0 +1,19 @@
+diff -up mono-nunit22-2.2.10/src/nunit.build.include.BAD mono-nunit22-2.2.10/src/nunit.build.include
+--- mono-nunit22-2.2.10/src/nunit.build.include.BAD 2008-04-11 10:12:49.000000000 -0400
++++ mono-nunit22-2.2.10/src/nunit.build.include 2008-04-11 10:13:07.000000000 -0400
+@@ -76,7 +76,7 @@
+ <!-- Frameworks supported by this build script. The first
+ installed framework found is the default for builds. -->
+ <property name="supported.frameworks"
+- value="net-2.0,net-1.1,net-1.0,mono-1.0,mono-2.0"/>
++ value="mono-1.0,mono-2.0"/>
+
+ <!-- Visual Studio locations -->
+ <if test="${platform::is-win32()}">
+@@ -329,4 +329,4 @@
+ <echo> VS 2005: ${vs.2005.path}</echo>
+ </target>
+
+-</project>
+\ No newline at end of file
++</project>
Index: mono-nunit22.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-nunit22/devel/mono-nunit22.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mono-nunit22.spec 3 Mar 2009 03:10:41 -0000 1.10
+++ mono-nunit22.spec 3 Mar 2009 20:26:04 -0000 1.11
@@ -1,25 +1,26 @@
%define debug_package %{nil}
Name: mono-nunit22
-Version: 2.4.8
-Release: 4%{?dist}
+Version: 2.2.10
+Release: 6%{?dist}
Summary: Unit-testing framework for .NET
URL: http://www.nunit.org/
License: MIT with acknowledgement
Group: System Environment/Libraries
-Source0: http://downloads.sourceforge.net/nunit/NUnit-2.4.8-src.zip
+Source0: http://downloads.sourceforge.net/nunit/NUnit-2.2.10-src.zip
Source1: nunit22.pc
-Patch0: mono-nunit22-248-buildkey.patch
+Patch0: nunit22-mono.patch
+Patch1: nunit22-key.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: mono-devel >= 2.2 , nant
+BuildRequires: mono-devel, nant
BuildRequires: unzip
-# I don't know why this thing needs fonts to be present at build. But it does.
-# It's C#. Who knows why it does the wacky things it does?
-BuildRequires: liberation-sans-fonts
-# There is no nant for ppc/ppc64/sparc64
-ExcludeArch: ppc64 ppc sparc64
+# I had to add this because someone updated this package to 2.4. The 2.4 Nunit
+# stuff comes out of the main mono package. This is the 2.2 compat version.
+Epoch: 1
+# 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,
@@ -37,7 +38,8 @@
%prep
%setup -q -c -n %{name}-%{version}
-%patch0 -p1 -b .key
+%patch0 -p1
+%patch1 -p1 -b .key
%build
sn -k nunit.snk
@@ -50,8 +52,9 @@
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,28 +78,6 @@
%changelog
-* Mon Mar 2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.8-4
-- add fonts as BR to get this turd building again
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.8-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Fri Jan 02 2009 Dennis Gilmore <dennis at ausil.us> 2.4.8-2
-- exclude sparc64
-- add missing changelog entries
-
-* 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
-
-* 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-nunit22/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 18 Dec 2008 12:32:05 -0000 1.3
+++ sources 3 Mar 2009 20:26:04 -0000 1.4
@@ -1 +1 @@
-460d0c283ae814f76d789b3fb10be647 NUnit-2.4.8-src.zip
+21f03da90e34d2eb36e9445c816f53c5 NUnit-2.2.10-src.zip
More information about the fedora-extras-commits
mailing list