From 66585cc729c9072037df2ab6ee2dbab816b17074c498d9f5a9bdb50b3302f9c7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 3 Nov 2016 19:08:56 +0000 Subject: [PATCH] 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