rpms/monodevelop/devel import.log, 1.6, 1.7 monodevelop.spec, 1.40, 1.41 monodevelop-1.9-libdir.patch, 1.1, NONE

[Paul F. Johnson]

Author: pfj

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

Modified Files:
	import.log monodevelop.spec 
Removed Files:
	monodevelop-1.9-libdir.patch 
Log Message:

Dropped the libdir patch and moved to a recursive sed 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	25 Nov 2008 15:59:32 -0000	1.6
+++ import.log	29 Nov 2008 16:31:08 -0000	1.7
@@ -4,3 +4,4 @@
 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
 monodevelop-1_9_1-1_pre1_fc10:HEAD:monodevelop-1.9.1-1.pre1.fc10.src.rpm:1227628723
+monodevelop-1_9_1-2_pre1_fc11:HEAD:monodevelop-1.9.1-2.pre1.fc11.src.rpm:1227975836


Index: monodevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- monodevelop.spec	25 Nov 2008 15:59:32 -0000	1.40
+++ monodevelop.spec	29 Nov 2008 16:31:08 -0000	1.41
@@ -11,14 +11,14 @@
 
 Name:           monodevelop
 Version:        1.9.1
-Release:        1.pre1%{?dist}
+Release:        2.pre1%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://monodevelop.com/
 Source0:        http://go-mono.com/sources/monodevelop/monodevelop-%{version}.tar.bz2
-Patch0:         monodevelop-1.9-libdir.patch
+#Patch0:         monodevelop-1.9-libdir.patch
 Patch1:		monodevelop-1.9-use-system-cecil.patch
 Patch2:		monodevelop-1.9-use-system-nunit.patch
 Patch3:		monodevelop-191-usemonocecil.patch
@@ -60,7 +60,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .libdir
+#%patch0 -p1 -b .libdir
 %patch1 -p1 -b .use-system-cecil
 %patch2 -p1 -b .use-system-nunit
 %patch3 -p1 -b .monocecil
@@ -69,6 +69,16 @@
 # Here is where we replace the LONGCECILSTRING and LONGCECILMDBSTRING
 # placeholders with the actual values for the Mono.Cecil and Mono.Cecil.Mdb
 # ver__token
+
+find . -name Makefile.in -or -name Makefile.am -or -name \*.pc.in \
+       -or -name \*.in \
+       | while read f ;
+         do
+           sed -i -e 's!$(prefix)/lib!%{_libdir}!' "$f" 
+           sed -i -e 's!@prefix@/lib!%{_libdir}!' "$f"
+           sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' "$f" ;
+         done
+
 for i in \
     src/addins/MonoDevelop.GtkCore/Makefile.{am,in} \
     src/addins/MonoDevelop.GtkCore/lib/Makefile.{am,in} \
@@ -143,6 +153,9 @@
 
 
 %changelog
+* Sat Nov 29 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.1-2.pre1
+- remove libdir patch, now using sed
+
 * Sun Nov 23 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.1-1.pre1
 - Update to 1.9.1 preview 1
 - Removed R mono-basic and vala


--- monodevelop-1.9-libdir.patch DELETED ---