rpms/meld/FC-4 meld-1.0.0-fedora-162403.patch, NONE, 1.1 meld-1.0.0-po_fr.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 meld.spec, 1.10, 1.11 sources, 1.5, 1.6

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	.cvsignore meld.spec sources 
Added Files:
	meld-1.0.0-fedora-162403.patch meld-1.0.0-po_fr.patch 
Log Message:
sync with devel and work around Core gnome-python2-gtksourceview crash bug 162403

meld-1.0.0-fedora-162403.patch:

--- NEW FILE meld-1.0.0-fedora-162403.patch ---
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"
 

meld-1.0.0-po_fr.patch:

--- NEW FILE meld-1.0.0-po_fr.patch ---
--- meld-1.0.0.old/po/fr.po	2005-07-03 18:41:20.000000000 -0400
+++ meld-1.0.0/po/fr.po	2005-07-03 18:40:45.000000000 -0400
@@ -15,6 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../meld.desktop.in.h:1
 msgid "Compare and merge your files."


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/meld/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Jun 2005 19:30:51 -0000	1.5
+++ .cvsignore	20 Aug 2005 12:55:39 -0000	1.6
@@ -1 +1 @@
-meld-0.9.6.tar.bz2
+meld-1.0.0.tar.bz2


Index: meld.spec
===================================================================
RCS file: /cvs/extras/rpms/meld/FC-4/meld.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- meld.spec	8 Jun 2005 20:17:42 -0000	1.10
+++ meld.spec	20 Aug 2005 12:55:39 -0000	1.11
@@ -1,13 +1,15 @@
 Name:             meld
-Version:          0.9.6
-Release:          1
+Version:          1.0.0
+Release:          0.1%{?dist}
 Summary:          Visual diff and merge tool
 
 Group:            Development/Tools
 License:          GPL
 URL:              http://meld.sourceforge.net/
-Source0:          http://ftp.gnome.org/pub/gnome/sources/meld/0.9/meld-%{version}.tar.bz2
+Source0:          http://ftp.gnome.org/pub/gnome/sources/meld/1.0/meld-%{version}.tar.bz2
 Patch0:           desktop.patch
+Patch1:           meld-1.0.0-po_fr.patch
+Patch2:           meld-1.0.0-fedora-162403.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    desktop-file-utils
@@ -36,6 +38,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .desktop
+%patch1 -p1 -b .po_fr
+%patch2 -p1 -b .fedora-162403
 
 
 %build
@@ -82,6 +86,14 @@
 
 
 %changelog
+* 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.
+
 * Wed Jun  8 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.6-1
 - Remove unused meld shell script from src.rpm.
 - Add scriptlets for scrollkeeper-update.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/meld/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Jun 2005 19:30:51 -0000	1.5
+++ sources	20 Aug 2005 12:55:39 -0000	1.6
@@ -1 +1 @@
-73419987b125c0cfbb1f04cfe454a8e5  meld-0.9.6.tar.bz2
+ccde817f0396d39e9e40f31a3a7611f6  meld-1.0.0.tar.bz2