Accepting request 246062 from GNOME:Next

Push GNOME 3.13.90

OBS-URL: https://build.opensuse.org/request/show/246062
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gedit-plugins?expand=0&rev=69

gedit-plugins-3.12.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:431adb6c8327d755329061f59d9f06e94819e398b7910751bbe46bc96679c67f
-size 1291692

gedit-plugins-3.13.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de77be990eac0b12a5d65e2c857fcea5e3589bc25da28185427a868f2dd63877
+size 1316316

gedit-plugins-vte-2.91.patch

@@ -0,0 +1,40 @@
+From 1a17abfbc38ebdaea0714ea77875499b55dcc333 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Sat, 26 Jul 2014 18:25:42 +0200
+Subject: [PATCH] terminal: Use VTE 2.91
+
+https://bugzilla.gnome.org/show_bug.cgi?id=733176
+---
+ configure.ac                 | 2 +-
+ plugins/terminal/terminal.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b5d974d..d3a462a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -151,7 +151,7 @@ then
+ 	# ================================================================
+ 	# Terminal (vte)
+ 	# ================================================================
+-	if `$PYTHON -c "import gi; gi.require_version('Vte', '2.90')" 2>/dev/null`;
++	if `$PYTHON -c "import gi; gi.require_version('Vte', '2.91')" 2>/dev/null`;
+ 	then
+ 		have_vte=yes
+ 		PLUGINS="$PLUGINS terminal"
+diff --git a/plugins/terminal/terminal.py b/plugins/terminal/terminal.py
+index 01bf770..e77de2c 100644
+--- a/plugins/terminal/terminal.py
++++ b/plugins/terminal/terminal.py
+@@ -21,7 +21,7 @@
+ # Boston, MA  02110-1301  USA
+ 
+ import gi
+-gi.require_version('Vte', '2.90')
++gi.require_version('Vte', '2.91')
+ from gi.repository import GObject, GLib, Gio, Pango, Gdk, Gtk, Gedit, Vte
+ import os
+ import gettext
+-- 
+2.0.1
+

gedit-plugins.changes

@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Sat Jul 26 16:21:25 UTC 2014 - dimstar@opensuse.org
+
+- Update to version 3.13.2:
+  + Adapt to the rename of gedit's desktop file.
+
+-------------------------------------------------------------------
+Tue Jul 22 21:09:21 UTC 2014 - dimstar@opensuse.org
+
+- Update to version 3.13.1:
+  + Adapt the plugins for the changes in GeditDocument.
+  + Various improvements and bug fixes.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Sat Jul 12 22:29:02 UTC 2014 - dimstar@opensuse.org
+
+- Update to version 3.13.0:
+  + Moved zeitgeist plugin from gedit core to plugins.
+  + Updated translations.
+- Add pkgconfig(zeitgeist-2.0) BuildRequires.
+- Create new subpackage gedit-plugin-zeitgeist (moved from gedit
+  mainpackage, preserved the name of the package).
+- Add gedit-plugins-vte-2.91.patch: Detect and use Vte 2.91.
+- Add gnome-common BuildRequires and call to autogen.sh, as above
+  patch touches the buildsystem.
+- Replace pkgconfig(vte-2.90) BuildRequires with
+  pkgconfig(vte-2.91).
+
 -------------------------------------------------------------------
 Mon Apr 14 20:03:14 UTC 2014 - zaitor@opensuse.org
 

gedit-plugins.spec

@@ -21,22 +21,26 @@ Name:           gedit-plugins
 Summary:        A collection of plugins for gedit
 License:        GPL-2.0+
 Group:          Productivity/Editors/Other
-Version:        3.12.1
+Version:        3.13.2
 Release:        0
-Source:         http://download.gnome.org/sources/gedit-plugins/3.12/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gedit-plugins/3.13/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM gedit-plugins-vte-2.91.patch bgo#733176 dimstar@opensuse.org -- Detect and support Vte 2.91
+Patch0:         gedit-plugins-vte-2.91.patch
 Url:            http://live.gnome.org/GeditPlugins
 BuildRequires:  fdupes
+BuildRequires:  gnome-common
 BuildRequires:  intltool
 BuildRequires:  pkg-config
 BuildRequires:  translation-update-upstream
 BuildRequires:  yelp-tools
 BuildRequires:  pkgconfig(dbus-python)
-BuildRequires:  pkgconfig(gedit) >= 3.12.0
+BuildRequires:  pkgconfig(gedit) >= 3.13.3
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.9.0
-BuildRequires:  pkgconfig(gtksourceview-3.0) >= 3.9.2
+BuildRequires:  pkgconfig(gtksourceview-3.0) >= 3.13.2
 BuildRequires:  pkgconfig(libgit2-glib-1.0) >= 0.0.6
 BuildRequires:  pkgconfig(libpeas-gtk-1.0) >= 1.7.0
-BuildRequires:  pkgconfig(vte-2.90)
+BuildRequires:  pkgconfig(vte-2.91)
+BuildRequires:  pkgconfig(zeitgeist-2.0) >= 0.9.12
 Requires:       %{name}-lang = %{version}
 Requires:       gedit
 # For dashboard plugin
@@ -63,12 +67,25 @@ Here follows a list of plugins currently available in gedit-plugins:
  * Show tabbar A very basic plugin which shows or hides the gedit tabbar
  * Terminal A simple terminal widget accessible from the bottom panel
 
+%package -n gedit-plugin-zeitgeist
+Summary:        Zeitgeist dataprovider for gedit
+Group:          Productivity/Text/Editors
+Requires:       gedit
+Supplements:    packageand(gedit:zeitgeist)
+
+%description -n gedit-plugin-zeitgeist
+The zeitgeist plugin for gedit provides a zeitgeist dataprovider that
+logs access and leave event for documents used with gedit.
+
 %lang_package
 %prep
 %setup -q
 translation-update-upstream
+%patch0 -p1
 
 %build
+## Needed for patch0
+NOCONFIGURE=1 ./autogen.sh
 %configure
 %__make %{?jobs:-j%jobs} V=1
 
@@ -93,64 +110,95 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 # Common files
 %{_libdir}/gedit/plugins/gpdefs.py*
+%{_libdir}/gedit/plugins/__pycache__/gpdefs.*
+%dir %{_libdir}/gedit/plugins/__pycache__
 ## Explicitly list all plugins so we know when we miss one
 # bookmarks
+%{_datadir}/appdata/gedit-bookmarks.metainfo.xml
 %{_libdir}/gedit/plugins/bookmarks.plugin
 %{_libdir}/gedit/plugins/libbookmarks.so
 # bracketcompletion
+%{_datadir}/appdata/gedit-bracketcompletion.metainfo.xml
 %{_libdir}/gedit/plugins/bracketcompletion.plugin
 %{_libdir}/gedit/plugins/bracketcompletion.py*
+%{_libdir}/gedit/plugins/__pycache__/bracketcompletion.*
 # charmap
+%{_datadir}/appdata/gedit-charmap.metainfo.xml
 %{_libdir}/gedit/plugins/charmap.plugin
 %{_libdir}/gedit/plugins/charmap/
 # codecomment
+%{_datadir}/appdata/gedit-codecomment.metainfo.xml
 %{_libdir}/gedit/plugins/codecomment.plugin
 %{_libdir}/gedit/plugins/codecomment.py*
+%{_libdir}/gedit/plugins/__pycache__/codecomment.*
 # colorpicker
+%{_datadir}/appdata/gedit-colorpicker.metainfo.xml
 %{_libdir}/gedit/plugins/colorpicker.plugin
 %{_libdir}/gedit/plugins/colorpicker.py*
+%{_libdir}/gedit/plugins/__pycache__/colorpicker.*
 # colorschemer
+%{_datadir}/appdata/gedit-colorschemer.metainfo.xml
 %{_libdir}/gedit/plugins/colorschemer.plugin
 %{_datadir}/gedit/plugins/colorschemer/
 %{_libdir}/gedit/plugins/colorschemer/
 # commander
+%{_datadir}/appdata/gedit-commander.metainfo.xml
 %{_libdir}/gedit/plugins/commander.plugin
 %{_libdir}/gedit/plugins/commander/
 %{_datadir}/gedit/plugins/commander/
 # dashboard
+%{_datadir}/appdata/gedit-dashboard.metainfo.xml
 %{_libdir}/gedit/plugins/dashboard.plugin
 %{_libdir}/gedit/plugins/dashboard/
 # drawspaces
+%{_datadir}/appdata/gedit-drawspaces.metainfo.xml
 %{_libdir}/gedit/plugins/drawspaces.plugin
 %{_libdir}/gedit/plugins/libdrawspaces.so
 %{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.drawspaces.gschema.xml
 # git
+%{_datadir}/appdata/gedit-git.metainfo.xml
 %{_libdir}/gedit/plugins/git.plugin
 %{_libdir}/gedit/plugins/git/
 # joinlines
+%{_datadir}/appdata/gedit-joinlines.metainfo.xml
 %{_libdir}/gedit/plugins/joinlines.plugin
 %{_libdir}/gedit/plugins/joinlines.py*
+%{_libdir}/gedit/plugins/__pycache__/joinlines.*
 # multiedit
+%{_datadir}/appdata/gedit-multiedit.metainfo.xml
 %{_libdir}/gedit/plugins/multiedit.plugin
 %{_libdir}/gedit/plugins/multiedit/
 # smartspaces
+%{_datadir}/appdata/gedit-smartspaces.metainfo.xml
 %{_libdir}/gedit/plugins/smartspaces.plugin
 %{_libdir}/gedit/plugins/smartspaces.py*
+%{_libdir}/gedit/plugins/__pycache__/smartspaces.*
 # synctex
+%{_datadir}/appdata/gedit-synctex.metainfo.xml
 %{_libdir}/gedit/plugins/synctex.plugin
 %{_libdir}/gedit/plugins/synctex/
 # terminal
+%{_datadir}/appdata/gedit-terminal.metainfo.xml
 %{_libdir}/gedit/plugins/terminal.plugin
 %{_libdir}/gedit/plugins/terminal.py*
+%{_libdir}/gedit/plugins/__pycache__/terminal.*
 %{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.terminal.gschema.xml
 # textsize
+%{_datadir}/appdata/gedit-textsize.metainfo.xml
 %{_libdir}/gedit/plugins/textsize.plugin
 %{_libdir}/gedit/plugins/textsize/
 # wordcompletion
+%{_datadir}/appdata/gedit-wordcompletion.metainfo.xml
 %{_libdir}/gedit/plugins/wordcompletion.plugin
 %{_libdir}/gedit/plugins/libwordcompletion.so
 %{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.wordcompletion.gschema.xml
 
 %files lang -f %{name}.lang
 
+%files -n gedit-plugin-zeitgeist
+%defattr(-, root, root)
+%{_datadir}/appdata/gedit-zeitgeist.metainfo.xml
+%{_libdir}/gedit/plugins/zeitgeist.plugin
+%{_libdir}/gedit/plugins/libzeitgeist.so
+
 %changelog