[gedit/f14/master] revert to 2.30

Thu Aug 12 01:30:09 UTC 2010

commit d263f954cc6dc6fa6b6ce0719d6a388cdecef96d
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Aug 11 21:28:46 2010 -0400

    revert to 2.30

 gedit.spec          |   83 +++++++++++++++++++++++++++------------------------
 print-to-file.patch |   11 +++----
 sources             |    2 +-
 3 files changed, 50 insertions(+), 46 deletions(-)
---

diff --git a/gedit.spec b/gedit.spec
index 9f8be76..d8b06e0 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -1,26 +1,32 @@
 %define glib2_version 2.22.0
+%define gtk2_version 2.16.0
 %define desktop_file_utils_version 0.9
-%define gtksourceview_version 2.10.2
+%define gail_version 1.2.0
+%define gtksourceview_version 2.9.4
 %define pygtk_version 2.12.0
 %define pygobject_version 2.15.4
 %define pygtksourceview_version 2.8.0
 %define gnome_python_desktop_version 2.15.90
 %define gnome_doc_utils_version 0.3.2
+%define gconf_version 2.14
 %define enchant_version 1.2.0
 %define isocodes_version 0.35
 
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
-Version: 	2.31.5
+Epoch:		2
+Version: 	2.30.2
 Release: 	2%{?dist}
-Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
 #VCS: git:git://git.gnome.org/gedit
-Source0:	http://download.gnome.org/sources/gedit/2.31/gedit-%{version}.tar.bz2
+Source0:	http://download.gnome.org/sources/gedit/2.30/gedit-%{version}.tar.bz2
 
 URL:		http://projects.gnome.org/gedit/
 
+Requires(post):		GConf2 >= %{gconf_version}
+Requires(pre):		GConf2 >= %{gconf_version}
+Requires(preun):	GConf2 >= %{gconf_version}
 Requires(post):         desktop-file-utils >= %{desktop_file_utils_version}
 Requires(postun):       desktop-file-utils >= %{desktop_file_utils_version}
 
@@ -31,29 +37,30 @@ Requires(postun):       desktop-file-utils >= %{desktop_file_utils_version}
 Patch1: gedit-2.13.90-libdir.patch
 %endif
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=587053
-#Patch3: print-to-file.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=569214
+Patch2: gedit-2.25.5-fix-python-path.patch
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=619898
-Patch4: gedit-gsettings-migration.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=587053
+Patch3: print-to-file.patch
 
 BuildRequires: gnome-common
 BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gtk3-devel
+BuildRequires: pango-devel >= %{pango_version}
+BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: GConf2-devel
 BuildRequires: libSM-devel
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: enchant-devel >= %{enchant_version}
 BuildRequires: iso-codes-devel >= %{isocodes_version}
 BuildRequires: libattr-devel
-BuildRequires: gtksourceview3-devel >= %{gtksourceview_version}
+BuildRequires: gail-devel >= %{gail_version}
+BuildRequires: gtksourceview2-devel >= %{gtksourceview_version}
 BuildRequires: scrollkeeper gettext
 BuildRequires: pygtk2-devel >= %{pygtk_version}
 BuildRequires: pygobject2-devel >= %{pygobject_version}
 BuildRequires: pygtksourceview-devel >= %{pygtksourceview_version}
 BuildRequires: python-devel
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
-BuildRequires: libpeas-devel
 BuildRequires: which
 BuildRequires: autoconf, automake, libtool
 BuildRequires: intltool
@@ -100,18 +107,18 @@ Install gedit-devel if you want to write plugins for gedit.
 %patch1 -p1 -b .libdir
 %endif
 
-#%patch3 -p1 -b .print-to-file
-%patch4 -p1 -b .gsettings-migration
+%patch2 -p1 -b .fix-python-path
+%patch3 -p1 -b .print-to-file
 
-automake
-autoconf
+autoreconf -f -i
+intltoolize -f
 
 %build
 %configure \
 	--disable-scrollkeeper \
-        --disable-introspection \
-	--disable-gtk-doc
-make %{_smp_mflags}
+	--disable-gtk-doc \
+	--enable-python
+make
 
 # strip unneeded translations from .mo files
 # ideally intltool (ha!) would do that for us
@@ -136,8 +143,9 @@ desktop-file-install --delete-original       	\
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
 ## clean up all the static libs for plugins (workaround for no -module)
-/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir} -name "*.a"`
-/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir} -name "*.la"`
+/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins -name "*.a"`
+/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins -name "*.la"`
+/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugin-loaders -name "*.la"`
 
 /bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
@@ -161,51 +169,48 @@ done
 
 %post
 update-desktop-database -q
+%gconf_schema_upgrade gedit
 touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
+%pre
+%gconf_schema_prepare gedit
+
+%preun
+%gconf_schema_remove gedit
+
 %postun
 update-desktop-database -q
 if [ $1 -eq 0 ]; then
   touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
   gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
-  glib-compile-schemas %{_datadir}/glib-2.0/schemas
 fi
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
-glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc README COPYING AUTHORS
-%{_datadir}/gedit
+%{_datadir}/gedit-2
 %{_datadir}/applications/gedit.desktop
 %{_mandir}/man1/*
-%{_libdir}/gedit
-%{_libdir}/libgedit-private.so.*
-%{_libexecdir}/gedit
+%{_libdir}/gedit-2
+%{_libexecdir}/gedit-2
 %{_bindir}/*
-%{_datadir}/GConf/gsettings
-%{_datadir}/glib-2.0/schemas/org.gnome.gedit.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gedit.enums.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.enums.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gedit.time.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.enums.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gedit.pythonconsole.gschema.xml
-%{_datadir}/dbus-1/services/org.gnome.gedit.service
+%{_sysconfdir}/gconf/schemas/*
 
 
 %files devel
 %defattr(-, root, root)
-%{_includedir}/gedit-3.0
-
-%{_libdir}/libgedit-private.so
-%{_libdir}/pkgconfig/gedit.pc
+%{_includedir}/gedit-2.20
+%{_libdir}/pkgconfig/gedit-2.20.pc
 %{_datadir}/gtk-doc/html/gedit/
 
 
 %changelog
+* Wed Aug 11 2010 Matthias Clasen <mclasen at redhat.com> - 2:2.30.2-2
+- Revert to 2.30 for F14
+
 * Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 1:2.31.5-2
 - recompiling .py files against Python 2.7 (rhbz#623307)
 
diff --git a/print-to-file.patch b/print-to-file.patch
index a873ca7..7e0af5c 100644
--- a/print-to-file.patch
+++ b/print-to-file.patch
@@ -1,8 +1,7 @@
-diff --git a/gedit/gedit-tab.c b/gedit/gedit-tab.c
-index 7b81732..2352487 100644
---- a/gedit/gedit-tab.c
-+++ b/gedit/gedit-tab.c
-@@ -2262,6 +2262,8 @@ get_print_settings (GeditTab *tab)
+diff -up gedit-2.29.7/gedit/gedit-tab.c.print-to-file gedit-2.29.7/gedit/gedit-tab.c
+--- gedit-2.29.7/gedit/gedit-tab.c.print-to-file	2010-02-21 06:23:12.000000000 -0500
++++ gedit-2.29.7/gedit/gedit-tab.c	2010-02-23 08:41:06.803882795 -0500
+@@ -2276,6 +2276,8 @@ get_print_settings (GeditTab *tab)
  {
  	gpointer data;
  	GeditDocument *doc;
@@ -11,7 +10,7 @@ index 7b81732..2352487 100644
  
  	doc = gedit_tab_get_document (tab);
  
-@@ -2270,12 +2272,24 @@ get_print_settings (GeditTab *tab)
+@@ -2284,12 +2286,24 @@ get_print_settings (GeditTab *tab)
  
  	if (data == NULL)
  	{
diff --git a/sources b/sources
index d8b5c15..450d989 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c255ce082c7fac0e7902149ec05d0fdf  gedit-2.31.5.tar.bz2
+00ccd2fdba5c5e1d3bc54da5377f0277  gedit-2.30.2.tar.bz2
