From 0d76842fee3657150c3e33fe8046374fecd24de1 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 05:07:41 +0000
Subject: auto-import changelog data from gedit-2.7.90-1.src.rpm

2.7.90-1
- Upgrade to 2.7.90
- Add patch to use Pango font names, not gnome-print font names

---

diff --git a/.cvsignore b/.cvsignore
index f6b5012..191559b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gedit-2.6.1.tar.bz2
+gedit-2.7.90.tar.bz2
diff --git a/gedit.spec b/gedit.spec
index 4918132..376c1a2 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -2,20 +2,20 @@
 %define pango_version 1.2.0
 %define gtk2_version 2.2.0
 %define libgnomeui_version 2.5.0
-%define libgnomeprint_version 2.5.0
-%define libgnomeprintui_version 2.5.0
+%define libgnomeprint_version 2.7.1
+%define libgnomeprintui_version 2.7.1
 %define desktop_file_utils_version 0.3
 %define eel2_version 2.4.0
 %define gail_version 1.2.0
-%define gtksourceview_version 0.9
+%define gtksourceview_version 1.1
 %define eel2_version 2.5.0
 
 %define po_package gedit-2.6
 
 Summary:		gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
-Version:		2.6.1
-Release: 2
+Version:		2.7.90
+Release: 1
 Epoch:		1
 License:		GPL
 Group:		Applications/Editors
@@ -26,12 +26,13 @@ BuildRoot:	%{_tmppath}/gedit-%{version}-root
 PreReq:		scrollkeeper >= 0.1.4
 PreReq:		GConf2
 
-# Make the recent file locking a bit less annoying
-Patch2: gedit-2.5.90-lockf.patch
 # Allow Escape key to close Find and Replace dialogs
 Patch3: gedit-2.4.0-escapecancel.patch
 # Make the file selector remember last window size and directory
 Patch4: gedit-2.5.90-filesel.patch
+# Use Pango font names
+# http://bugzilla.gnome.org/show_bug.cgi?id=143877
+Patch5: gedit-2.7.90-pango-fonts.patch
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -45,7 +46,8 @@ BuildRequires: eel2-devel >= %{eel2_version}
 BuildRequires: gail-devel >= %{gail_version}
 BuildRequires: gtksourceview-devel >= %{gtksourceview_version}
 BuildRequires: automake >= 1.8
-BuildRequires: intltool scrollkeeper gettext
+BuildRequires: intltool >= 0.3.1
+BuildRequires: scrollkeeper gettext
 
 Requires: eel2 >= %{eel2_version}
 Requires: libgnomeui >= %{libgnomeui_version}
@@ -75,11 +77,17 @@ Install gedit-devel if you want to write plug-ins for gEdit.
 %prep
 %setup -n gedit-%{version} -q
 
-%patch2 -p1 -b .lockf
 %patch3 -p1 -b .escapecancel
 %patch4 -p1 -b .filesel
+%patch5 -p0 -b .pango-fonts
 
 %build
+
+#
+# gedit-2.7.90 was built with intltool-0.30 which corrupted
+# the generated schema files
+# 
+intltoolize --force --copy
 %configure
 make
 
@@ -147,6 +155,10 @@ scrollkeeper-update
 %{_libdir}/pkgconfig/gedit-2.6.pc
 
 %changelog
+* Tue Aug  3 2004 Owen Taylor <otaylor@redhat.com> - 1:2.7.90-1
+- Upgrade to 2.7.90
+- Add patch to use Pango font names, not gnome-print font names
+
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 
diff --git a/sources b/sources
index bef3328..e78ffa6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4b70327b3a4c11727a4443ae6516b31c  gedit-2.6.1.tar.bz2
+1c99006b7eceeb82f4e1417fc6be24f7  gedit-2.7.90.tar.bz2