From b3d098419e814864634a4a308abe50bb1be463546b17d1776625b3ca5f49755e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 8 Sep 2016 13:34:08 +0000 Subject: [PATCH 1/4] Accepting request 424603 from home:Mailaender:branches:GNOME:Apps document build dependencies in the changelog OBS-URL: https://build.opensuse.org/request/show/424603 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gbrainy?expand=0&rev=70 --- appdata-workaround.patch | 23 +++++++++++++++++++++++ gbrainy-2.2.7.tar.gz | 3 --- gbrainy-2.3.0.tar.gz | 3 +++ gbrainy.changes | 12 ++++++++++++ gbrainy.spec | 15 +++++++++------ 5 files changed, 47 insertions(+), 9 deletions(-) create mode 100644 appdata-workaround.patch delete mode 100644 gbrainy-2.2.7.tar.gz create mode 100644 gbrainy-2.3.0.tar.gz diff --git a/appdata-workaround.patch b/appdata-workaround.patch new file mode 100644 index 0000000..db7459d --- /dev/null +++ b/appdata-workaround.patch @@ -0,0 +1,23 @@ +From a07f55476e83144554dd253df2519a9ce018a1e0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= + +Date: Sun, 21 Aug 2016 11:30:56 +0200 +Subject: [PATCH] Resolve the screenshot redirect. + +--- + data/gbrainy.appdata.xml.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/gbrainy.appdata.xml.in b/data/gbrainy.appdata.xml.in +index 4c3af0a..7df826f 100644 +--- a/data/gbrainy.appdata.xml.in ++++ b/data/gbrainy.appdata.xml.in +@@ -15,7 +15,7 @@ + + + +- http://gent.softcatala.org/jmas/gbrainy/gbrainy-screenshot-appdata.png ++ https://gent.softcatala.org/jmas/gbrainy/gbrainy-screenshot-appdata.png + + https://wiki.gnome.org/action/show/Apps/gbrainy/ + jmas_at_softcatala_dot_org diff --git a/gbrainy-2.2.7.tar.gz b/gbrainy-2.2.7.tar.gz deleted file mode 100644 index 0fefc3a..0000000 --- a/gbrainy-2.2.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f400675178e02b78ac8e1111a237119a57cc77348bea0f143f51356615edfadb -size 2933715 diff --git a/gbrainy-2.3.0.tar.gz b/gbrainy-2.3.0.tar.gz new file mode 100644 index 0000000..c00b68f --- /dev/null +++ b/gbrainy-2.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:290db61ce37e0e2178f941423bd7ddbc968170ae17d8b40fbab0f05410dbeb89 +size 2930324 diff --git a/gbrainy.changes b/gbrainy.changes index 2be0029..b3af02a 100644 --- a/gbrainy.changes +++ b/gbrainy.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Aug 21 09:18:17 UTC 2016 - mailaender@opensuse.org + +* Update to version 2.3.0 + * Ported to Gtk3. + * Updated translations. +* Add appdata-workaround.patch + as https://github.com/openSUSE/software-o-o/pull/88 is stalling. +* Update build requirements + * gtk-sharp2 to gtk-sharp-3.0 + * libcanberra-gtk to libcanberra-gtk3 + ------------------------------------------------------------------- Tue Jan 12 14:53:37 UTC 2016 - dimstar@opensuse.org diff --git a/gbrainy.spec b/gbrainy.spec index 4314b2c..a37f63d 100644 --- a/gbrainy.spec +++ b/gbrainy.spec @@ -17,7 +17,7 @@ Name: gbrainy -Version: 2.2.7 +Version: 2.3.0 Release: 0 Summary: A brain teaser game and trainer License: GPL-2.0+ @@ -26,15 +26,17 @@ Url: http://live.gnome.org/gbrainy Source: http://gent.softcatala.org/jmas/gbrainy/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE -- gbrainy-use-libexecdir.patch Patch0: gbrainy-use-libexecdir.patch +# PATCH-FIX-UPSTREAM https://github.com/GNOME/gbrainy/pull/1 +Patch1: appdata-workaround.patch BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel -BuildRequires: gtk-sharp2 BuildRequires: intltool -BuildRequires: librsvg-devel -BuildRequires: mono-addins -BuildRequires: mono-devel >= 3.0.0 BuildRequires: translation-update-upstream -BuildRequires: pkgconfig(libcanberra-gtk) >= 0.26 +BuildRequires: pkgconfig(gtk-sharp-3.0) +BuildRequires: pkgconfig(libcanberra-gtk3) >= 0.26 +BuildRequires: pkgconfig(librsvg-2.0) +BuildRequires: pkgconfig(mono) +BuildRequires: pkgconfig(mono-addins) BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: update-desktop-files @@ -63,6 +65,7 @@ It provides the following types of games: %setup -q translation-update-upstream %patch0 +%patch1 -p1 %lang_package From 9c7f5b02f5df30e004de31224c4e53705290aa4a2ff59edb0aee828dee452346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 8 Sep 2016 22:40:42 +0000 Subject: [PATCH 2/4] Accepting request 425943 from home:Zaitor:branches:GNOME:Apps Supersede OBS-URL: https://build.opensuse.org/request/show/425943 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gbrainy?expand=0&rev=71 --- appdata-workaround.patch | 12 +++++++----- gbrainy.changes | 20 ++++++++++++-------- gbrainy.spec | 2 +- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/appdata-workaround.patch b/appdata-workaround.patch index db7459d..d7a26cc 100644 --- a/appdata-workaround.patch +++ b/appdata-workaround.patch @@ -1,8 +1,7 @@ -From a07f55476e83144554dd253df2519a9ce018a1e0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= - -Date: Sun, 21 Aug 2016 11:30:56 +0200 -Subject: [PATCH] Resolve the screenshot redirect. +From 5e326bb7b278f10968ac92130df9cf3ac00f4340 Mon Sep 17 00:00:00 2001 +From: Jordi Mas +Date: Tue, 6 Sep 2016 23:17:24 +0200 +Subject: Fixes #770604 --- data/gbrainy.appdata.xml.in | 2 +- @@ -21,3 +20,6 @@ index 4c3af0a..7df826f 100644 https://wiki.gnome.org/action/show/Apps/gbrainy/ jmas_at_softcatala_dot_org +-- +cgit v0.12 + diff --git a/gbrainy.changes b/gbrainy.changes index b3af02a..c8e6257 100644 --- a/gbrainy.changes +++ b/gbrainy.changes @@ -1,14 +1,18 @@ ------------------------------------------------------------------- Sun Aug 21 09:18:17 UTC 2016 - mailaender@opensuse.org -* Update to version 2.3.0 - * Ported to Gtk3. - * Updated translations. -* Add appdata-workaround.patch - as https://github.com/openSUSE/software-o-o/pull/88 is stalling. -* Update build requirements - * gtk-sharp2 to gtk-sharp-3.0 - * libcanberra-gtk to libcanberra-gtk3 +- Update to version 2.3.0: + + Ported to Gtk3. + + Small fixes. + + Updated translations. +- Add appdata-workaround.patch: Directly link to https. Fixed + upstream already (bgo#770604). +- Replace BuildRequirements: + + gtk-sharp2 for pkgconfig(gtk-sharp-3.0). + + pkgconfig(libcanberra-gtk) for pkgconfig(libcanberra-gtk3). + + librsvg-devel for pkgconfig(librsvg-2.0). + + mono-addins for pkgconfig(mono-addins). + + mono-devel for pkgconfig(mono). ------------------------------------------------------------------- Tue Jan 12 14:53:37 UTC 2016 - dimstar@opensuse.org diff --git a/gbrainy.spec b/gbrainy.spec index a37f63d..f79f5d3 100644 --- a/gbrainy.spec +++ b/gbrainy.spec @@ -26,7 +26,7 @@ Url: http://live.gnome.org/gbrainy Source: http://gent.softcatala.org/jmas/gbrainy/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE -- gbrainy-use-libexecdir.patch Patch0: gbrainy-use-libexecdir.patch -# PATCH-FIX-UPSTREAM https://github.com/GNOME/gbrainy/pull/1 +# PATCH-FIX-UPSTREAM appdata-workaround.patch bgo#770604 mailaender@opensuse.org -- appdata: Directly link to https:// instead of relying on a redirect Patch1: appdata-workaround.patch BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel From 37f69fe8f8740fd192a2fd723420710ae78603f539295a455ab6a8eff4c5d03e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 8 Sep 2016 22:44:09 +0000 Subject: [PATCH 3/4] Rename patch while im at it OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gbrainy?expand=0&rev=72 --- appdata-workaround.patch => gbrainy-appdata-workaround.patch | 0 gbrainy.changes | 4 ++-- gbrainy.spec | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename appdata-workaround.patch => gbrainy-appdata-workaround.patch (100%) diff --git a/appdata-workaround.patch b/gbrainy-appdata-workaround.patch similarity index 100% rename from appdata-workaround.patch rename to gbrainy-appdata-workaround.patch diff --git a/gbrainy.changes b/gbrainy.changes index c8e6257..b97b745 100644 --- a/gbrainy.changes +++ b/gbrainy.changes @@ -5,8 +5,8 @@ Sun Aug 21 09:18:17 UTC 2016 - mailaender@opensuse.org + Ported to Gtk3. + Small fixes. + Updated translations. -- Add appdata-workaround.patch: Directly link to https. Fixed - upstream already (bgo#770604). +- Add gbrainy-appdata-workaround.patch: Directly link to https. + Fixed upstream already (bgo#770604). - Replace BuildRequirements: + gtk-sharp2 for pkgconfig(gtk-sharp-3.0). + pkgconfig(libcanberra-gtk) for pkgconfig(libcanberra-gtk3). diff --git a/gbrainy.spec b/gbrainy.spec index f79f5d3..8732852 100644 --- a/gbrainy.spec +++ b/gbrainy.spec @@ -26,8 +26,8 @@ Url: http://live.gnome.org/gbrainy Source: http://gent.softcatala.org/jmas/gbrainy/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE -- gbrainy-use-libexecdir.patch Patch0: gbrainy-use-libexecdir.patch -# PATCH-FIX-UPSTREAM appdata-workaround.patch bgo#770604 mailaender@opensuse.org -- appdata: Directly link to https:// instead of relying on a redirect -Patch1: appdata-workaround.patch +# PATCH-FIX-UPSTREAM gbrainy-appdata-workaround.patch bgo#770604 mailaender@opensuse.org -- appdata: Directly link to https:// instead of relying on a redirect +Patch1: gbrainy-appdata-workaround.patch BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: intltool From 22781c967767bbc48db63cbbb355e5e2eacc2034805a67c30a2ca8d27117bc7d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 3 Nov 2016 19:08:56 +0000 Subject: [PATCH 4/4] Accepting request 438581 from home:dimstar:branches:GNOME:Apps Update to 2.3.1 OBS-URL: https://build.opensuse.org/request/show/438581 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gbrainy?expand=0&rev=73 --- gbrainy-2.3.0.tar.gz | 3 --- gbrainy-2.3.1.tar.gz | 3 +++ gbrainy-appdata-workaround.patch | 25 --------------------- gbrainy.changes | 12 ++++++++++ gbrainy.spec | 38 ++++++++++++++------------------ 5 files changed, 32 insertions(+), 49 deletions(-) delete mode 100644 gbrainy-2.3.0.tar.gz create mode 100644 gbrainy-2.3.1.tar.gz delete mode 100644 gbrainy-appdata-workaround.patch diff --git a/gbrainy-2.3.0.tar.gz b/gbrainy-2.3.0.tar.gz deleted file mode 100644 index c00b68f..0000000 --- a/gbrainy-2.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:290db61ce37e0e2178f941423bd7ddbc968170ae17d8b40fbab0f05410dbeb89 -size 2930324 diff --git a/gbrainy-2.3.1.tar.gz b/gbrainy-2.3.1.tar.gz new file mode 100644 index 0000000..75c8476 --- /dev/null +++ b/gbrainy-2.3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4048a26f9d4d622c539c02d3ce9163f53bc32334aef20dfd88cc36ef18d88819 +size 2939658 diff --git a/gbrainy-appdata-workaround.patch b/gbrainy-appdata-workaround.patch deleted file mode 100644 index d7a26cc..0000000 --- a/gbrainy-appdata-workaround.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5e326bb7b278f10968ac92130df9cf3ac00f4340 Mon Sep 17 00:00:00 2001 -From: Jordi Mas -Date: Tue, 6 Sep 2016 23:17:24 +0200 -Subject: Fixes #770604 - ---- - data/gbrainy.appdata.xml.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/gbrainy.appdata.xml.in b/data/gbrainy.appdata.xml.in -index 4c3af0a..7df826f 100644 ---- a/data/gbrainy.appdata.xml.in -+++ b/data/gbrainy.appdata.xml.in -@@ -15,7 +15,7 @@ - - - -- http://gent.softcatala.org/jmas/gbrainy/gbrainy-screenshot-appdata.png -+ https://gent.softcatala.org/jmas/gbrainy/gbrainy-screenshot-appdata.png - - https://wiki.gnome.org/action/show/Apps/gbrainy/ - jmas_at_softcatala_dot_org --- -cgit v0.12 - diff --git a/gbrainy.changes b/gbrainy.changes index b97b745..bc74fe0 100644 --- a/gbrainy.changes +++ b/gbrainy.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Nov 3 12:45:22 UTC 2016 - dimstar@opensuse.org + +- Update to version 2.3.1: + + Port to new documentation infrastructure. + + Better metadata describing the app for software centers. + + Small bug fixes. + + Updated translations. +- Replace gnome-doc-utils-devel BuildRequires for yelp-tools, + following upstreams port to the new documentation infrastructure. +- Drop gbrainy-appdata-workaround.patch: fixed upstream. + ------------------------------------------------------------------- Sun Aug 21 09:18:17 UTC 2016 - mailaender@opensuse.org diff --git a/gbrainy.spec b/gbrainy.spec index 8732852..a98a55c 100644 --- a/gbrainy.spec +++ b/gbrainy.spec @@ -17,7 +17,7 @@ Name: gbrainy -Version: 2.3.0 +Version: 2.3.1 Release: 0 Summary: A brain teaser game and trainer License: GPL-2.0+ @@ -26,23 +26,22 @@ Url: http://live.gnome.org/gbrainy Source: http://gent.softcatala.org/jmas/gbrainy/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE -- gbrainy-use-libexecdir.patch Patch0: gbrainy-use-libexecdir.patch -# PATCH-FIX-UPSTREAM gbrainy-appdata-workaround.patch bgo#770604 mailaender@opensuse.org -- appdata: Directly link to https:// instead of relying on a redirect -Patch1: gbrainy-appdata-workaround.patch BuildRequires: fdupes -BuildRequires: gnome-doc-utils-devel BuildRequires: intltool +BuildRequires: pkgconfig BuildRequires: translation-update-upstream +BuildRequires: update-desktop-files +BuildRequires: yelp-tools BuildRequires: pkgconfig(gtk-sharp-3.0) BuildRequires: pkgconfig(libcanberra-gtk3) >= 0.26 BuildRequires: pkgconfig(librsvg-2.0) -BuildRequires: pkgconfig(mono) +BuildRequires: pkgconfig(mono) >= 4.0.0 BuildRequires: pkgconfig(mono-addins) -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch -BuildRequires: update-desktop-files Recommends: %{name}-lang # For the help system to work, we require a ghelp:// URI handler. Recommends: mimehandler(x-scheme-handler/ghelp) +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description gbrainy is a brain teaser game and trainer to have fun and to keep @@ -65,15 +64,14 @@ It provides the following types of games: %setup -q translation-update-upstream %patch0 -%patch1 -p1 %lang_package %build -export MONO_SHARED_DIR=/var/tmp +export MONO_SHARED_DIR=%{_localstatedir}/tmp %configure \ --disable-static -make +make %{?_smp_mflags} %install %make_install @@ -100,19 +98,17 @@ chmod -x %{buildroot}%{_libexecdir}/%{name}/gbrainy.exe.config %files %defattr(-,root,root) %doc AUTHORS NEWS README COPYING -%dir %{_datadir}/gnome/ -%dir %{_datadir}/gnome/help/ -%dir %{_datadir}/gnome/help/gbrainy/ -%doc %{_datadir}/gnome/help/gbrainy/C/ -%{_bindir}/gbrainy -%{_libexecdir}/gbrainy/ -%{_datadir}/games/gbrainy/ +%{_bindir}/%{name} +%{_libexecdir}/%{name}/ +%{_datadir}/games/%{name}/ +%{_datadir}/help/C/%{name}/ %dir %{_datadir}/appdata -%{_datadir}/appdata/gbrainy.appdata.xml -%{_datadir}/applications/gbrainy.desktop +%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/* -%{_mandir}/man6/gbrainy.6.gz +%{_mandir}/man6/%{name}.6%{?ext_man} %files lang -f %{name}.lang +%defattr(-,root,root) %changelog