packages: monodevelop/monodevelop-MOZILLA_FIVE_HOME.patch, monodevelop/mono...

[patrys]

Author: patrys                       Date: Wed Aug 26 09:09:34 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 2.0
- replace patch with find & sed (too hard to keep in sync)

---- Files affected:
packages/monodevelop:
   monodevelop-MOZILLA_FIVE_HOME.patch (1.12 -> 1.13) , monodevelop-desktop.patch (1.6 -> 1.7) , monodevelop.spec (1.67 -> 1.68) , monodevelop-libdir.patch (1.9 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/monodevelop/monodevelop-MOZILLA_FIVE_HOME.patch
diff -u packages/monodevelop/monodevelop-MOZILLA_FIVE_HOME.patch:1.12 packages/monodevelop/monodevelop-MOZILLA_FIVE_HOME.patch:1.13
--- packages/monodevelop/monodevelop-MOZILLA_FIVE_HOME.patch:1.12	Sat Feb 16 02:37:11 2008
+++ packages/monodevelop/monodevelop-MOZILLA_FIVE_HOME.patch	Wed Aug 26 11:09:28 2009
@@ -1,10 +1,9 @@
---- monodevelop-0.18/monodevelop.in~	2007-12-19 16:47:09.004304700 +0100
-+++ monodevelop-0.18/monodevelop.in	2007-12-19 16:48:28.498841222 +0100
-@@ -16,42 +16,7 @@
-     echo "$ret"
- }
+--- monodevelop-2.0/monodevelop.in~	2009-03-20 00:43:56.000000000 +0100
++++ monodevelop-2.0/monodevelop.in	2009-08-26 10:53:00.645206831 +0200
+@@ -12,41 +12,7 @@
+ ## BEGIN MOZILLA DETECTION ##
+ #############################
  
--
 -#(NOTE: any changes to this block should be kept in sync with the one in configure.in)
 -MOZFILE="libgtkembedmoz.so"
 -find_libgtkembedmoz ()
@@ -42,5 +41,5 @@
 -fi
 +MOZILLA_HOME=@libdir@/xulrunner
  
- MD_BIN_PATH=@prefix@/lib/monodevelop/bin
- 
+ if [ -n $LD_LIBRARY_PATH ]; then
+ 	export LD_LIBRARY_PATH="$MOZILLA_HOME:$LD_LIBRARY_PATH"

================================================================
Index: packages/monodevelop/monodevelop-desktop.patch
diff -u packages/monodevelop/monodevelop-desktop.patch:1.6 packages/monodevelop/monodevelop-desktop.patch:1.7
--- packages/monodevelop/monodevelop-desktop.patch:1.6	Sat Feb 16 02:37:11 2008
+++ packages/monodevelop/monodevelop-desktop.patch	Wed Aug 26 11:09:28 2009
@@ -11,12 +11,3 @@
  Exec=monodevelop
  TryExec=monodevelop
  Icon=monodevelop
-@@ -11,7 +11,7 @@
- Terminal=false
- Type=Application
- MimeType=text/x-csharp;application/x-mds;application/x-mdp;application/x-cmbx;application/x-prjx;application/x-csproj;application/x-vbproj;application/x-sln;
--Categories=Development;
-+Categories=GTK;GNOME;Development;IDE;
- X-GNOME-Bugzilla-Bugzilla=Ximian
- X-GNOME-Bugzilla-Product=MonoDevelop
- X-GNOME-Bugzilla-OtherBinaries=monodevelop

================================================================
Index: packages/monodevelop/monodevelop.spec
diff -u packages/monodevelop/monodevelop.spec:1.67 packages/monodevelop/monodevelop.spec:1.68
--- packages/monodevelop/monodevelop.spec:1.67	Sun Feb  8 00:57:49 2009
+++ packages/monodevelop/monodevelop.spec	Wed Aug 26 11:09:28 2009
@@ -11,17 +11,16 @@
 Summary:	Mono IDE
 Summary(pl.UTF-8):	IDE dla Mono
 Name:		monodevelop
-Version:	1.9.1
+Version:	2.0
 Release:	1
 License:	GPL/MIT
 Group:		Development/Tools
 # latest downloads summary at http://ftp.novell.com/pub/mono/sources-stable/
 Source0:	http://ftp.novell.com/pub/mono/sources/monodevelop/%{name}-%{version}.tar.bz2
-# Source0-md5:	de6d1b2d135836048e0091ae60edb591
+# Source0-md5:	0f527204ffd4785284d9556a75524c3e
 Patch0:		%{name}-MOZILLA_FIVE_HOME.patch
 Patch2:		%{name}-desktop.patch
 Patch3:		%{name}-install.patch
-Patch4:		%{name}-libdir.patch
 URL:		http://www.monodevelop.com/
 BuildRequires:	ORBit2-devel >= 2.8.3
 BuildRequires:	autoconf
@@ -102,7 +101,19 @@
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
+
+sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' configure
+sed -i -e 's!$PREFIX/lib/!%{_libdir}/!' monodevelop.in
+sed -i -e 's!$PREFIX/lib/!%{_libdir}/!' mdtool.in
+find . -name Makefile.in -or -name Makefile.am -or -name \*.pc.in \
+       -or -name \*.in -or -name \*.xml \
+       | while read f ;
+         do
+           sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' "$f" 
+           sed -i -e 's!@prefix@/lib/!%{_libdir}/!' "$f"
+           sed -i -e 's!/usr/lib/!%{_libdir}/!' "$f"
+           sed -i -e 's!${exec_prefix}/lib/!%{_libdir}/!' "$f" ;
+         done
 
 %build
 rm -rf autom4te.cache
@@ -159,6 +170,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.68  2009/08/26 09:09:28  patrys
+- 2.0
+- replace patch with find & sed (too hard to keep in sync)
+
 Revision 1.67  2009/02/07 23:57:49  aredridel
 - 1.9.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/monodevelop/monodevelop-MOZILLA_FIVE_HOME.patch?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/monodevelop/monodevelop-desktop.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/monodevelop/monodevelop.spec?r1=1.67&r2=1.68&f=u