[gedit/f20-gnome-3-12] Sync with rawhide

[Richard Hughes]

commit 21fbc9d0ab46c5f3d8d5ec168902d3809cc977e0
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Apr 14 21:32:14 2014 +0100

    Sync with rawhide

 gedit-2.13.90-libdir.patch         |   14 --------------
 gedit-remove-unity-quicklist.patch |   34 ----------------------------------
 gedit.spec                         |   26 +++++++++++---------------
 3 files changed, 11 insertions(+), 63 deletions(-)
---
diff --git a/gedit.spec b/gedit.spec
index 4702c38..3ed6725 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -12,10 +12,11 @@
 %global __python %{__python3}
 %endif
 
-%define glib2_version 2.37.5
+%define glib2_version 2.39.5
+%define gtk3_version 3.11.6
 %define pygo_version 3.0.0
 %define desktop_file_utils_version 0.9
-%define gtksourceview_version 3.9.91
+%define gtksourceview_version 3.11.2
 %define enchant_version 1.2.0
 %define isocodes_version 0.35
 %define libpeas_version 1.7.0
@@ -36,15 +37,11 @@ URL:		http://projects.gnome.org/gedit/
 Requires(post):         desktop-file-utils >= %{desktop_file_utils_version}
 Requires(postun):       desktop-file-utils >= %{desktop_file_utils_version}
 
-%ifarch ppc64,x86_64,ia64,s390x
-Patch1: gedit-2.13.90-libdir.patch
-%endif
-
 Patch4: gedit-disable-python3.patch
 
 BuildRequires: gnome-common
 BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gtk3-devel
+BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: libSM-devel
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: enchant-devel >= %{enchant_version}
@@ -61,6 +58,7 @@ BuildRequires: intltool
 BuildRequires: gobject-introspection-devel
 BuildRequires: yelp-tools
 BuildRequires: itstool
+BuildRequires: vala-tools
 %if %{with_python3}
 BuildRequires: python3-devel
 BuildRequires: python3-gobject >= %{pygo_version}
@@ -68,6 +66,9 @@ BuildRequires: python3-gobject >= %{pygo_version}
 BuildRequires: python-devel
 %endif
 
+Requires: glib2%{?_isa} >= %{glib2_version}
+Requires: gtk3%{?_isa} >= %{gtk3_version}
+Requires: gtksourceview3%{?_isa} >= %{gtksourceview_version}
 %if %{with_python3}
 Requires: python3-gobject >= %{pygo_version}
 %endif
@@ -117,10 +118,6 @@ access and leave event for documents used with gedit.
 %prep
 %setup -q
 
-%ifarch ppc64,x86_64,ia64,s390x
-%patch1 -p1 -b .libdir
-%endif
-
 %if !%{with_python3}
 %patch4 -p1 -b .disable-python
 %endif
@@ -183,8 +180,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 %dir %{_libdir}/gedit
 %dir %{_libdir}/gedit/plugins
 %{_libdir}/gedit/libgedit-private.so
-%{_libdir}/gedit/plugins/changecase.plugin
-%{_libdir}/gedit/plugins/libchangecase.so
 %{_libdir}/gedit/plugins/docinfo.plugin
 %{_libdir}/gedit/plugins/libdocinfo.so
 %{_libdir}/gedit/plugins/filebrowser.plugin
@@ -224,14 +219,15 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 
 
 %files devel
-%{_includedir}/gedit-3.0
+%{_includedir}/gedit-3.12
 %{_libdir}/pkgconfig/gedit.pc
 %{_datadir}/gtk-doc
+%{_datadir}/vala/
 
 %if %{with_zeitgeist}
 %files zeitgeist
 %{_libdir}/gedit/plugins/zeitgeist.plugin
-%{_libdir}/gedit/plugins/libzeitgeistplugin.so
+%{_libdir}/gedit/plugins/libzeitgeist.so
 %endif
 
 %changelog