rpms/monodevelop/devel import.log, 1.4, 1.5 monodevelop.spec, 1.38, 1.39

[Paul F. Johnson]

Author: pfj

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

Modified Files:
	import.log monodevelop.spec 
Log Message:

Fixes Requires dependancy problems



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	10 Sep 2008 19:35:27 -0000	1.4
+++ import.log	19 Oct 2008 13:42:42 -0000	1.5
@@ -2,3 +2,4 @@
 monodevelop-1_9-2_fc10:HEAD:monodevelop-1.9-2.fc10.src.rpm:1215687691
 monodevelop-1_9-3_fc10:HEAD:monodevelop-1.9-3.fc10.src.rpm:1218291689
 monodevelop-1_9-6_fc10:HEAD:monodevelop-1.9-6.fc10.src.rpm:1221075263
+monodevelop-1_9-7_fc10:HEAD:monodevelop-1.9-7.fc10.src.rpm:1224423709


Index: monodevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- monodevelop.spec	10 Sep 2008 19:35:27 -0000	1.38
+++ monodevelop.spec	19 Oct 2008 13:42:42 -0000	1.39
@@ -1,9 +1,9 @@
 %define debug_package %{nil}
 
-%define cecilver %(gacutil -l Mono.Cecil |grep Mono.Cecil | cut -d "=" -f 2 | cut -d "," -f 1)
-%define ceciltoken %(gacutil -l Mono.Cecil |grep Mono.Cecil | cut -d "=" -f 4)
-%define cecilmdbver %(gacutil -l Mono.Cecil.Mdb |grep Mono.Cecil.Mdb | cut -d "=" -f 2 | cut -d "," -f 1)
-%define cecilmdbtoken %(gacutil -l Mono.Cecil.Mdb |grep Mono.Cecil.Mdb | cut -d "=" -f 4)
+#%define cecilver %(gacutil -l Mono.Cecil |grep Mono.Cecil | cut -d "=" -f 2 | cut -d "," -f 1)
+#%define ceciltoken %(gacutil -l Mono.Cecil |grep Mono.Cecil | cut -d "=" -f 4)
+#%define cecilmdbver %(gacutil -l Mono.Cecil.Mdb |grep Mono.Cecil.Mdb | cut -d "=" -f 2 | cut -d "," -f 1)
+#%define cecilmdbtoken %(gacutil -l Mono.Cecil.Mdb |grep Mono.Cecil.Mdb | cut -d "=" -f 4)
 
 #%(gacutil -l nunit.core | tail -n 2 | grep nunit.core | cut -d "=" -f 2 | cut -d "," -f 1)
 %define nunitver 2.2.10.0
@@ -11,7 +11,7 @@
 
 Name:           monodevelop
 Version:        1.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
 Group:          Development/Tools
@@ -36,7 +36,7 @@
 # Using system nunit, but dependency not automatically picked up by RPM
 Requires:	mono(nunit.core) = 2.2.10.0
 Requires:	mono(nunit.framework) = 2.2.10.0
-Requires:       monodoc
+Requires:       monodoc, gnome-sharp gtk-sharp2 gnome-desktop-sharp
 Requires:       subversion
 Requires:       hicolor-icon-theme shared-mime-info
 
@@ -65,29 +65,28 @@
 %patch1 -p1 -b .use-system-cecil
 %patch2 -p1 -b .use-system-nunit
 %patch3 -p1 -b .head
-autoconf
+autoreconf
 
 # Here is where we replace the LONGCECILSTRING and LONGCECILMDBSTRING
 # placeholders with the actual values for the Mono.Cecil and Mono.Cecil.Mdb
 # ver__token
-cd src
 for i in \
-    addins/MonoDevelop.GtkCore/Makefile.{am,in} \
-    addins/MonoDevelop.GtkCore/lib/Makefile.{am,in} \
-    addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am \
-    addins/MonoDevelop.DesignerSupport/Makefile.{am,in} \
-    addins/MonoDevelop.AssemblyBrowser/Makefile.{am,in} \
-    core/MonoDevelop.Projects/Makefile.{am,in} \
+    src/addins/MonoDevelop.GtkCore/Makefile.{am,in} \
+    src/addins/MonoDevelop.GtkCore/lib/Makefile.{am,in} \
+    src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am \
+    src/addins/MonoDevelop.DesignerSupport/Makefile.{am,in} \
+    src/addins/MonoDevelop.AssemblyBrowser/Makefile.{am,in} \
+    src/core/MonoDevelop.Projects/Makefile.{am,in} \
 ; do
   sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' "$i"
 done
 
-for i in core/MonoDevelop.Projects/Makefile.{am,in};
+for i in src/core/MonoDevelop.Projects/Makefile.{am,in};
 do
   sed -i 's|LONGCECILMDBSTRING|%{cecilmdbver}__%{cecilmdbtoken}|g' "$i"
 done
 
-sed -i addins/NUnit/MonoDevelopNUnit.addin.xml -e 's|LIBDIR|%{_libdir}|'
+sed -i src/addins/NUnit/MonoDevelopNUnit.addin.xml -e 's|LIBDIR|%{_libdir}|'
 
 
 %build
@@ -145,8 +144,10 @@
 %{_libdir}/pkgconfig/monodevelop*.pc
 
 
-
 %changelog
+* Sat Oct 18 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-7
+- Fix dependancies of R (BZ 467544)
+
 * Tue Sep 09 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-6
 - Added patch to build against 2.0 RC 1
 - rebuild against 2.0 RC 1