From 6bd133d536c8868c0b9fb4ba4ad52cb9e88403255eb9c0423d338f4504af7c15 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 7 Dec 2011 15:23:11 +0000 Subject: [PATCH 1/2] Accepting request 95696 from home:dimstar:branches:GNOME:Factory Update to 3.3.1 - Resubmit after the mass factory license tag change OBS-URL: https://build.opensuse.org/request/show/95696 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gedit-plugins?expand=0&rev=35 --- gedit-plugins-3.2.1.tar.bz2 | 3 --- gedit-plugins-3.3.1.tar.xz | 3 +++ gedit-plugins-implicit.patch | 24 ++++++++++++++++++++++++ gedit-plugins.changes | 14 ++++++++++++++ gedit-plugins.spec | 11 ++++++++--- 5 files changed, 49 insertions(+), 6 deletions(-) delete mode 100644 gedit-plugins-3.2.1.tar.bz2 create mode 100644 gedit-plugins-3.3.1.tar.xz create mode 100644 gedit-plugins-implicit.patch diff --git a/gedit-plugins-3.2.1.tar.bz2 b/gedit-plugins-3.2.1.tar.bz2 deleted file mode 100644 index df42ed4..0000000 --- a/gedit-plugins-3.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f6b5bc88ca61d8f0bc4dd54b2dc82473acfefd90453e4d4ffc3ca88d4182f4d -size 1663468 diff --git a/gedit-plugins-3.3.1.tar.xz b/gedit-plugins-3.3.1.tar.xz new file mode 100644 index 0000000..8c8f863 --- /dev/null +++ b/gedit-plugins-3.3.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e2de6c18f8be8943f5b8ee024fe383740175afdbb17d10b86690215ce45d3ed +size 1440660 diff --git a/gedit-plugins-implicit.patch b/gedit-plugins-implicit.patch new file mode 100644 index 0000000..d8bae05 --- /dev/null +++ b/gedit-plugins-implicit.patch @@ -0,0 +1,24 @@ +From 593a411f82e59f5b25d62042d5e31078571e17b6 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Sun, 4 Dec 2011 14:21:48 +0100 +Subject: [PATCH] bookmarks: include stdlib.h to have atoi() defined. + +--- + plugins/bookmarks/gedit-bookmarks-plugin.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/plugins/bookmarks/gedit-bookmarks-plugin.c b/plugins/bookmarks/gedit-bookmarks-plugin.c +index 88e6c7a..40b94fd 100644 +--- a/plugins/bookmarks/gedit-bookmarks-plugin.c ++++ b/plugins/bookmarks/gedit-bookmarks-plugin.c +@@ -25,6 +25,7 @@ + #include "gedit-bookmarks-plugin.h" + #include "messages/messages.h" + ++#include // for atoi() + #include + #include + #include +-- +1.7.7 + diff --git a/gedit-plugins.changes b/gedit-plugins.changes index b16d754..7ad6f80 100644 --- a/gedit-plugins.changes +++ b/gedit-plugins.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sun Dec 4 13:14:29 UTC 2011 - dimstar@opensuse.org + +- Update to version 3.3.1: + + New dashboard plugin + + Misc bugfixes + + Updated translations. +- Add xz BuildRequires because we can't build a package for a + xz-compressed tarball without explicitly specifying that... See + bnc#697467 for more details. +- Add gedit-plugins-implicit.patch: Fix an implicit declaration of + atoi(), as stdlib.h was not included. +- Change License tag to spdx identifier (GPL-2.0+). + ------------------------------------------------------------------- Mon Oct 17 06:00:28 UTC 2011 - vuntz@opensuse.org diff --git a/gedit-plugins.spec b/gedit-plugins.spec index 991fc92..a0d0160 100644 --- a/gedit-plugins.spec +++ b/gedit-plugins.spec @@ -20,10 +20,12 @@ Name: gedit-plugins Summary: A collection of plugins for gedit -Version: 3.2.1 +Version: 3.3.1 Release: 1 -Source: http://download.gnome.org/sources/gedit-plugins/3.2/%{name}-%{version}.tar.bz2 -License: GPLv2+ +Source: http://download.gnome.org/sources/gedit-plugins/3.3/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gedit-plugins-implicit.patch bgo#665541 dimstar@opensuse.org -- #include stdio.h to have atoi defined. +Patch0: gedit-plugins-implicit.patch +License: GPL-2.0+ Group: Productivity/Editors/Other Url: http://live.gnome.org/GeditPlugins BuildRequires: fdupes @@ -31,6 +33,8 @@ BuildRequires: gnome-doc-utils-devel BuildRequires: intltool BuildRequires: pkg-config BuildRequires: translation-update-upstream +# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 +BuildRequires: xz BuildRequires: pkgconfig(dbus-python) BuildRequires: pkgconfig(gedit) >= 3.2.1 BuildRequires: pkgconfig(gtk+-3.0) @@ -62,6 +66,7 @@ Here follows a list of plugins currently available in gedit-plugins: %prep %setup -q +%patch0 -p1 translation-update-upstream %lang_package From f9f3e35d767f637937efccb1a26c054343afc6c314df9ba87263c899f74cab23 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 21 Dec 2011 14:59:53 +0000 Subject: [PATCH 2/2] Accepting request 97666 from home:vuntz:branches:GNOME:Factory Add zeitgeist Requires OBS-URL: https://build.opensuse.org/request/show/97666 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gedit-plugins?expand=0&rev=36 --- gedit-plugins.changes | 8 +++++ gedit-plugins.spec | 71 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 73 insertions(+), 6 deletions(-) diff --git a/gedit-plugins.changes b/gedit-plugins.changes index 7ad6f80..bfc99e6 100644 --- a/gedit-plugins.changes +++ b/gedit-plugins.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Dec 21 14:23:43 UTC 2011 - vuntz@opensuse.org + +- Add zeitgeist Requires for the dashboard plugin. +- Remove .la files: we're not interested in them. +- Explicitly list all plugins in the file list, so we notice if + we're missing one. + ------------------------------------------------------------------- Sun Dec 4 13:14:29 UTC 2011 - dimstar@opensuse.org diff --git a/gedit-plugins.spec b/gedit-plugins.spec index a0d0160..1f31b32 100644 --- a/gedit-plugins.spec +++ b/gedit-plugins.spec @@ -17,16 +17,15 @@ # - Name: gedit-plugins Summary: A collection of plugins for gedit +License: GPL-2.0+ +Group: Productivity/Editors/Other Version: 3.3.1 -Release: 1 +Release: 0 Source: http://download.gnome.org/sources/gedit-plugins/3.3/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM gedit-plugins-implicit.patch bgo#665541 dimstar@opensuse.org -- #include stdio.h to have atoi defined. Patch0: gedit-plugins-implicit.patch -License: GPL-2.0+ -Group: Productivity/Editors/Other Url: http://live.gnome.org/GeditPlugins BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel @@ -42,6 +41,8 @@ BuildRequires: pkgconfig(gtksourceview-3.0) BuildRequires: pkgconfig(libpeas-gtk-1.0) Requires: gedit Requires: %{name}-lang = %{version} +# For dashboard plugin +Requires: zeitgeist Enhances: gedit BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires @@ -80,6 +81,7 @@ translation-update-upstream # sr@latin was added by translation-update-upstream, so kill sr@Latn test -d %{buildroot}%{_datadir}/locale/sr@latin rm -r %{buildroot}%{_datadir}/locale/sr@Latn +find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %find_lang %{name} %fdupes %{buildroot}/%{_datadir}/gedit-2/plugins %fdupes %{buildroot}/%{_libdir}/gedit-2/plugins @@ -95,10 +97,67 @@ rm -rf %{buildroot} %files %defattr(-,root,root) -%{_libdir}/gedit/plugins/* -%{_datadir}/gedit/plugins/* +# Common files +%{_libdir}/gedit/plugins/gpdefs.py* +## Explicitly list all plugins so we know when we miss one +# bookmarks +%{_libdir}/gedit/plugins/bookmarks.plugin +%{_libdir}/gedit/plugins/libbookmarks.so +%{_datadir}/gedit/plugins/bookmarks/ +# bracketcompletion +%{_libdir}/gedit/plugins/bracketcompletion.plugin +%{_libdir}/gedit/plugins/bracketcompletion.py* +# charmap +%{_libdir}/gedit/plugins/charmap.plugin +%{_libdir}/gedit/plugins/charmap/ +# codecomment +%{_libdir}/gedit/plugins/codecomment.plugin +%{_libdir}/gedit/plugins/codecomment.py* +# colorpicker +%{_libdir}/gedit/plugins/colorpicker.plugin +%{_libdir}/gedit/plugins/colorpicker.py* +# commander +%{_libdir}/gedit/plugins/commander.plugin +%{_libdir}/gedit/plugins/commander/ +%{_datadir}/gedit/plugins/commander/ +# dashboard +%{_libdir}/gedit/plugins/dashboard.plugin +%{_libdir}/gedit/plugins/dashboard/ +# drawspaces +%{_libdir}/gedit/plugins/drawspaces.plugin +%{_libdir}/gedit/plugins/libdrawspaces.so +%{_datadir}/gedit/plugins/drawspaces/ %{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.drawspaces.gschema.xml +# joinlines +%{_libdir}/gedit/plugins/joinlines.plugin +%{_libdir}/gedit/plugins/joinlines.py* +# multiedit +%{_libdir}/gedit/plugins/multiedit.plugin +%{_libdir}/gedit/plugins/multiedit/ +# sessionsaver +%{_libdir}/gedit/plugins/sessionsaver.plugin +%{_libdir}/gedit/plugins/sessionsaver/ +%{_datadir}/gedit/plugins/sessionsaver/ +# smartspaces +%{_libdir}/gedit/plugins/smartspaces.plugin +%{_libdir}/gedit/plugins/smartspaces.py* +# synctex +%{_libdir}/gedit/plugins/synctex.plugin +%{_libdir}/gedit/plugins/synctex/ +# taglist +%{_libdir}/gedit/plugins/taglist.plugin +%{_libdir}/gedit/plugins/libtaglist.so +%{_datadir}/gedit/plugins/taglist/ +# terminal +%{_libdir}/gedit/plugins/terminal.plugin +%{_libdir}/gedit/plugins/terminal.py* %{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.terminal.gschema.xml +# textsize +%{_libdir}/gedit/plugins/textsize.plugin +%{_libdir}/gedit/plugins/textsize/ +# wordcompletion +%{_libdir}/gedit/plugins/wordcompletion.plugin +%{_libdir}/gedit/plugins/libwordcompletion.so %files lang -f %{name}.lang