From c9df99598695a6cbcb4c3b519791afa09dc68181c8ed0144005b6b7d911965b2 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Mon, 25 Apr 2011 09:32:43 +0000
Subject: [PATCH] Accepting request 68296 from
home:vuntz:branches:GNOME:Factory
ok
OBS-URL: https://build.opensuse.org/request/show/68296
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gedit?expand=0&rev=79
---
gedit.changes | 25 ++++++++++++++++---------
gedit.spec | 19 ++++++++++---------
2 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/gedit.changes b/gedit.changes
index a8e1aac..56d1332 100644
--- a/gedit.changes
+++ b/gedit.changes
@@ -55,16 +55,23 @@ Mon Mar 28 16:17:25 UTC 2011 - fcrozat@novell.com
- Changes from version 2.90.0:
+ Add GSettings migration file
+ Misc bugfixes
-- Change old-style buildRequires to new pkgconfig()/GNOME3 ones:
- gtksourceview-devel, gconf2-devel, python-devel,
- python-gobject2-devel, python-gtk-devel,
- python-gtksourceview-devel to gtksourceview-3.0, libpeas-gtk-1.0,
+- Drop BuildRequires: gconf2-devel (move to GSettings),
+ python-devel, python-gtk-devel, python-gtksourceview-devel (move
+ to libpeas-based plugins).
+- Add new pkgconfig() BuildRequires: libpeas-gtk-1.0,
gsettings-desktop-schemas, libsoup-2.4.
-- Replace GConf2 schemas handling with GSettings schemas handling.
-- Requires python-gobject instead of python-gnome / python-gobject2
- / python-gtk / python-gtksourceview, thanks to introspection
- based python binding.
-- Fix Obsoletes for gedit-doc (strict version obsolete)
+- Move to pkgconfig()-style BuildRequires:
+ + Old ones: gtksourceview-devel, python-gobject2-devel.
+ + New ones: gtksourceview-3.0, pygobject-2.0.
+- Replace GConf2 schemas handling with GSettings schemas handling,
+ with %glib2_gsettings_schema_* macros.
+- Replace python-gnome, python-gobject2, python-gtk,
+ python-gtksourceview Requires with just a python-gobject Requires
+ thanks to introspection-based python binding.
+- Change Obsoletes for gedit-doc to be strict (< instead of <=) now
+ that we have a new version.
+- Add /sbin/ldconfig to %post/%postun as there is now a (private)
+ library installed by the package.
-------------------------------------------------------------------
Fri Feb 18 13:56:50 UTC 2011 - gber@opensuse.org
diff --git a/gedit.spec b/gedit.spec
index fae8fde..5d47ed2 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -32,15 +32,15 @@ BuildRequires: fdupes
BuildRequires: gettext
BuildRequires: gnome-doc-utils-devel
BuildRequires: gtk-doc
-BuildRequires: pkgconfig(gtksourceview-3.0)
-BuildRequires: pkgconfig(libpeas-gtk-1.0)
-BuildRequires: pkgconfig(gsettings-desktop-schemas)
-BuildRequires: pkgconfig(libsoup-2.4)
-BuildRequires: pkgconfig(pygobject-2.0)
BuildRequires: intltool
BuildRequires: iso-codes-devel
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
+BuildRequires: pkgconfig(gsettings-desktop-schemas)
+BuildRequires: pkgconfig(gtksourceview-3.0)
+BuildRequires: pkgconfig(libpeas-gtk-1.0)
+BuildRequires: pkgconfig(libsoup-2.4)
+BuildRequires: pkgconfig(pygobject-2.0)
Requires: python-gobject
Recommends: %{name}-lang
Provides: gedit2 = %{version}
@@ -111,9 +111,9 @@ rm -rf %{buildroot}
%{_bindir}/gedit
%{_bindir}/gnome-text-editor
%{_datadir}/applications/*.desktop
-%{_datadir}/gedit
%{_datadir}/dbus-1/services/org.gnome.gedit.service
%{_datadir}/GConf/gsettings/gedit.convert
+%{_datadir}/gedit/
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.enums.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.externaltools.gschema.xml
@@ -122,11 +122,12 @@ rm -rf %{buildroot}
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.pythonconsole.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.enums.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.gschema.xml
-
+%{_libdir}/gedit/
+%if "%{_libdir}" != "%{_libexecdir}"
+%{_libexecdir}/gedit/
+%endif
%{_libdir}/libgedit-private.so.0*
%{py_sitedir}/gi/overrides/Gedit.py*
-%{_libdir}/gedit
-%{_libexecdir}/gedit
%doc %{_mandir}/man1/gedit*
%files lang -f %{name}.lang