rpms/monodevelop/devel monodevelop-1.9-use-system-nunit.patch, NONE, 1.1 monodevelop.spec, 1.34, 1.35

[Michel Alexandre Salim]

Author: salimma

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

Modified Files:
	monodevelop.spec 
Added Files:
	monodevelop-1.9-use-system-nunit.patch 
Log Message:
* Mon Aug 25 2008 Michel Salim <salimma at fedoraproject.org> - 1.9-5
- Use system-provided nunit


monodevelop-1.9-use-system-nunit.patch:

--- NEW FILE monodevelop-1.9-use-system-nunit.patch ---
--- monodevelop-1.9/src/addins/NUnit/MonoDevelopNUnit.addin.xml.use-system-nunit	2008-06-30 13:34:01.000000000 -0400
+++ monodevelop-1.9/src/addins/NUnit/MonoDevelopNUnit.addin.xml	2008-08-25 22:51:10.000000000 -0400
@@ -10,8 +10,8 @@
 
 	<Runtime>
 		<Import assembly="MonoDevelop.NUnit.dll" />
-		<Import assembly="nunit.core.dll" />
-		<Import assembly="nunit.framework.dll" />
+		<Import assembly="LIBDIR/mono/nunit22/nunit.core.dll" />
+		<Import assembly="LIBDIR/mono/nunit22/nunit.framework.dll" />
 	</Runtime>
 	
 	<Dependencies>
--- monodevelop-1.9/src/addins/NUnit/Makefile.in.use-system-nunit	2008-06-30 19:33:58.000000000 -0400
+++ monodevelop-1.9/src/addins/NUnit/Makefile.in	2008-08-25 22:20:39.000000000 -0400
@@ -186,8 +186,8 @@
 	-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
 	-r:$(top_builddir)/build/bin/MonoDevelop.Projects.dll \
-	-r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.dll \
-	-r:$(top_srcdir)/src/addins/NUnit/lib/nunit.framework.dll \
+	-r:$(libdir)/mono/nunit22/nunit.core.dll \
+	-r:$(libdir)/mono/nunit22/nunit.framework.dll \
 	-r:System \
 	-r:System.Xml
 
@@ -248,16 +248,10 @@
 	templates/NUnitProject.xpt.xml \
 	templates/NUnitTestClass.xft.xml
 
-NUNIT_FILES = \
-nunit.core.dll \
-nunit.framework.dll
-
-SRC_NUNIT_FILES = $(addprefix $(srcdir)/lib/, $(NUNIT_FILES))
-BUILD_NUNIT_FILES = $(addprefix $(ADDIN_BUILD)/, $(NUNIT_FILES))
 assemblydir = $(MD_ADDIN_DIR)/NUnit
-assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb $(SRC_NUNIT_FILES)
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(BUILD_NUNIT_FILES)
-EXTRA_DIST = $(FILES) $(RES) $(SRC_NUNIT_FILES)
+assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
+EXTRA_DIST = $(FILES) $(RES)
 build_sources = $(addprefix $(srcdir)/, $(FILES)) $(GENERATED_FILES)
 build_resources = $(addprefix $(srcdir)/, $(RES))
 build_test_sources = $(addprefix $(srcdir)/, $(TESTFILES)) $(GENERATED_FILES)
@@ -454,7 +448,7 @@
 	pdf-am ps ps-am uninstall uninstall-am uninstall-assemblyDATA
 
 
-all: $(ASSEMBLY) $(BUILD_NUNIT_FILES)
+all: $(ASSEMBLY)
 
 $(ADDIN_BUILD)/%: $(srcdir)/lib/%
 	mkdir -p $(ADDIN_BUILD)


Index: monodevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- monodevelop.spec	24 Aug 2008 21:46:53 -0000	1.34
+++ monodevelop.spec	26 Aug 2008 04:02:56 -0000	1.35
@@ -8,7 +8,7 @@
 
 Name:           monodevelop
 Version:        1.9
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
 Group:          Development/Tools
@@ -17,10 +17,13 @@
 Source0:        http://go-mono.com/sources/monodevelop/monodevelop-%{version}.tar.bz2
 Patch0:         monodevelop-1.9-libdir.patch
 Patch1:		monodevelop-1.9-use-system-cecil.patch
+Patch2:		monodevelop-1.9-use-system-nunit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-addins-devel gtk-sharp2-devel monodoc-devel
 BuildRequires:  gnome-sharp-devel gnome-desktop-sharp-devel mono-nunit-devel
+# for the NUnit add-in
+BuildRequires:  mono-nunit22
 BuildRequires:  autoconf desktop-file-utils intltool
 # MonoDevelop is not xulrunner-ready yet
 #Requires:       gecko-sharp2
@@ -53,6 +56,7 @@
 %setup -q
 %patch0 -p1 -b .libdir
 %patch1 -p1 -b .use-system-cecil
+%patch2 -p1 -b .use-system-nunit
 autoconf
 
 # Here is where we replace the LONGCECILSTRING and LONGCECILMDBSTRING
@@ -75,6 +79,9 @@
   sed -i 's|LONGCECILMDBSTRING|%{cecilmdbver}__%{cecilmdbtoken}|g' "$i"
 done
 
+sed -i addins/NUnit/MonoDevelopNUnit.addin.xml -e 's|LIBDIR|%{_libdir}|'
+
+
 %build
 %configure --disable-update-mimedb \
            --disable-update-desktopdb \
@@ -132,6 +139,9 @@
 
 
 %changelog
+* Mon Aug 25 2008 Michel Salim <salimma at fedoraproject.org> - 1.9-5
+- Use system-provided nunit
+
 * Sat Aug 23 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 1.9-4
 - Clean up build dependencies: database support now a separate package
 - Clean up spec file and patches