rpms/meld/FC-4 meld-1.0.0-fedora-162403.patch, 1.2, 1.3 meld.spec, 1.13, 1.14

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/meld/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5325

Modified Files:
	meld.spec 
Added Files:
	meld-1.0.0-fedora-162403.patch 
Log Message:
bring back the patch that works around #162403

meld-1.0.0-fedora-162403.patch:

Index: meld-1.0.0-fedora-162403.patch
===================================================================
RCS file: meld-1.0.0-fedora-162403.patch
diff -N meld-1.0.0-fedora-162403.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ meld-1.0.0-fedora-162403.patch	15 Jan 2006 12:01:41 -0000	1.3
@@ -0,0 +1,66 @@
+diff -Nur meld-1.0.0-orig/filediff.py meld-1.0.0/filediff.py
+--- meld-1.0.0-orig/filediff.py	2005-06-23 20:41:08.000000000 +0200
++++ meld-1.0.0/filediff.py	2005-08-20 14:48:24.000000000 +0200
+@@ -38,13 +38,22 @@
+ 
+ sourceview_available = 0
+ 
+-for sourceview in "gtksourceview sourceview".split():
+-    try:
+-        gsv = __import__(sourceview)
+-        sourceview_available = 1
+-        break
+-    except ImportError:
+-        pass
++# Work around missing strict dependency in gnome-python2-gtksourceview.
++gnomeprint_available = 0
++try:
++	__import__("gnomeprint")
++	gnomeprint_available = 1
++except ImportError:
++	pass
++
++if gnomeprint_available == 1:
++	for sourceview in "gtksourceview sourceview".split():
++		try:
++			gsv = __import__(sourceview)
++			sourceview_available = 1
++			break
++		except ImportError:
++			pass
+ 
+ if sourceview_available:
+     def set_highlighting_enabled(buf, fname, enabled):
+diff -Nur meld-1.0.0-orig/meldapp.py meld-1.0.0/meldapp.py
+--- meld-1.0.0-orig/meldapp.py	2005-07-01 20:32:08.000000000 +0200
++++ meld-1.0.0/meldapp.py	2005-08-20 14:46:21.000000000 +0200
+@@ -37,13 +37,22 @@
+ # optional
+ sourceview_available = 0
+ 
+-for sourceview in "gtksourceview sourceview".split():
+-    try:
+-        __import__(sourceview)
+-        sourceview_available = 1
+-        break
+-    except ImportError:
+-        pass
++# Work around missing strict dependency in gnome-python2-gtksourceview.
++gnomeprint_available = 0
++try:
++	__import__("gnomeprint")
++	gnomeprint_available = 1
++except ImportError:
++	pass
++
++if gnomeprint_available == 1:
++	for sourceview in "gtksourceview sourceview".split():
++		try:
++			__import__(sourceview)
++			sourceview_available = 1
++			break
++		except ImportError:
++			pass
+ 
+ version = "1.0.0"
+ 


Index: meld.spec
===================================================================
RCS file: /cvs/extras/rpms/meld/FC-4/meld.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- meld.spec	15 Jan 2006 11:48:19 -0000	1.13
+++ meld.spec	15 Jan 2006 12:01:41 -0000	1.14
@@ -8,6 +8,7 @@
 URL:              http://meld.sourceforge.net/
 Source0:          http://ftp.gnome.org/pub/gnome/sources/meld/1.1/meld-%{version}.tar.bz2
 Patch0:           desktop.patch
+Patch1:           meld-1.0.0-fedora-162403.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    desktop-file-utils
@@ -20,9 +21,6 @@
 Requires:         pygtk2 >= 1.99.15
 Requires:         pygtk2-libglade
 
-# Ugly work-around for a packaging bug in Fedora Core 4 (#162403).
-Requires: gnome-python2-gtksourceview, gnome-python2-gnomeprint
-
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 
@@ -39,6 +37,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .desktop
+%patch1 -p1 -b .fedora-162403
 
 
 %build
@@ -86,12 +85,16 @@
 
 %changelog
 * Sun Jan 15 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.1.2-1
-- Add an ugly work-around for a packaging bug in Fedora Core 4 (#162403).
+- Bring back the patch from 1.0.0-0.1 (for #162403 in FC <= 4).
 - Deliberately not bumping release.
 
 * Sun Nov 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.1.2-1
 - Update to 1.1.2.
 
+* Sat Aug 20 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.0-0.1
+- Work around missing gnome-python2-gnomeprint dependency in
+  gnome-python2-gtksourceview package for FC4 and FC3 (#162403).
+
 * Mon Jul 25 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.0-1
 - Update to 1.0.0.
 - Include fix for upstream bug #309408.