From 4ac90c8d01ba6958810650e6710c8a2bea86eba0ca40c9753821d35fdc334e47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 22 Mar 2019 16:50:31 +0000 Subject: [PATCH 1/2] Accepting request 687063 from home:iznogood:branches:GNOME:Apps - Update to version 2.4.0: + 2 bug fixes in games. + Several fixes in the build system. + Updated translations. - Changes from version 2.3.9: + 2 bug fixes in games. + Updated translations. - Changes from version 2.3.8: + Fixes bug with librsvg that prevented gbrainy from getting started. - Refresh patch with refresh_patches service. - Remove conditional for t-u-u and macro. OBS-URL: https://build.opensuse.org/request/show/687063 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gbrainy?expand=0&rev=85 --- gbrainy-2.3.7.tar.gz | 3 -- gbrainy-2.4.0.tar.gz | 3 ++ gbrainy-use-libexecdir.patch | 54 ++++++++++++++++++------------------ gbrainy.changes | 16 +++++++++++ gbrainy.spec | 13 +++++---- 5 files changed, 53 insertions(+), 36 deletions(-) delete mode 100644 gbrainy-2.3.7.tar.gz create mode 100644 gbrainy-2.4.0.tar.gz diff --git a/gbrainy-2.3.7.tar.gz b/gbrainy-2.3.7.tar.gz deleted file mode 100644 index b85a806..0000000 --- a/gbrainy-2.3.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f39779fe5f0afaaf6e7ed4bd718c80aaa2f297ed09dcef13b0110ff8c17c5c9 -size 2973874 diff --git a/gbrainy-2.4.0.tar.gz b/gbrainy-2.4.0.tar.gz new file mode 100644 index 0000000..3a6930f --- /dev/null +++ b/gbrainy-2.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d369847146f6ede22bb2ecd26703fb8df02837893ea241273b2cf2bf3d23156d +size 2994317 diff --git a/gbrainy-use-libexecdir.patch b/gbrainy-use-libexecdir.patch index 6a8a2d6..c4a3d2e 100644 --- a/gbrainy-use-libexecdir.patch +++ b/gbrainy-use-libexecdir.patch @@ -1,8 +1,8 @@ -Index: src/Clients/Classical/Makefile.am +Index: gbrainy-2.4.0/src/Clients/Classical/Makefile.am =================================================================== ---- src/Clients/Classical/Makefile.am.orig -+++ src/Clients/Classical/Makefile.am -@@ -41,7 +41,7 @@ RESOURCES = \ +--- gbrainy-2.4.0.orig/src/Clients/Classical/Makefile.am 2019-01-13 23:30:19.000000000 +0100 ++++ gbrainy-2.4.0/src/Clients/Classical/Makefile.am 2019-03-20 23:01:36.221865097 +0100 +@@ -46,7 +46,7 @@ RESOURCES = \ -resource:$(top_srcdir)/data/app-graphics/gtk-stop.svg \ -resource:$(top_srcdir)/data/app-graphics/gtk-ok.svg @@ -11,10 +11,10 @@ Index: src/Clients/Classical/Makefile.am gbrainy_SCRIPTS = ../../gbrainy.exe ../../gbrainy.exe.config bin_SCRIPTS = gbrainy -Index: src/Clients/Classical/gbrainy.in +Index: gbrainy-2.4.0/src/Clients/Classical/gbrainy.in =================================================================== ---- src/Clients/Classical/gbrainy.in.orig -+++ src/Clients/Classical/gbrainy.in +--- gbrainy-2.4.0.orig/src/Clients/Classical/gbrainy.in 2019-01-09 07:03:35.000000000 +0100 ++++ gbrainy-2.4.0/src/Clients/Classical/gbrainy.in 2019-03-20 23:01:36.221865097 +0100 @@ -1,10 +1,8 @@ #!/bin/bash @@ -28,11 +28,11 @@ Index: src/Clients/Classical/gbrainy.in for arg in $*; do case "x--debug" in ("x${arg}") -Index: src/Core/Makefile.am +Index: gbrainy-2.4.0/src/Core/Makefile.am =================================================================== ---- src/Core/Makefile.am.orig -+++ src/Core/Makefile.am -@@ -69,19 +69,19 @@ $(TARGET): $(CSFILES) $(RES) +--- gbrainy-2.4.0.orig/src/Core/Makefile.am 2019-01-09 07:03:35.000000000 +0100 ++++ gbrainy-2.4.0/src/Core/Makefile.am 2019-03-20 23:01:36.221865097 +0100 +@@ -104,19 +104,19 @@ $(TARGET): $(CSFILES) $(RES) $(CSC) -out:$@ $(CSFLAGS) $(REFS) $(RES_CSFLAGS) $(CSFILES) $(TARGET_CFG): $(srcdir)/gbrainy.Core.dll.config.in @@ -58,11 +58,11 @@ Index: src/Core/Makefile.am EXTRA_DIST = \ $(CSDISTFILES) $(RES) gbrainy.Core.dll.config.in -Index: src/Core/Makefile.in +Index: gbrainy-2.4.0/src/Core/Makefile.in =================================================================== ---- src/Core/Makefile.in.orig -+++ src/Core/Makefile.in -@@ -472,19 +472,19 @@ $(TARGET): $(CSFILES) $(RES) +--- gbrainy-2.4.0.orig/src/Core/Makefile.in 2019-03-19 13:44:07.000000000 +0100 ++++ gbrainy-2.4.0/src/Core/Makefile.in 2019-03-20 23:01:36.221865097 +0100 +@@ -607,19 +607,19 @@ $(TARGET): $(CSFILES) $(RES) $(CSC) -out:$@ $(CSFLAGS) $(REFS) $(RES_CSFLAGS) $(CSFILES) $(TARGET_CFG): $(srcdir)/gbrainy.Core.dll.config.in @@ -88,11 +88,11 @@ Index: src/Core/Makefile.in # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -Index: src/Games/Makefile.am +Index: gbrainy-2.4.0/src/Games/Makefile.am =================================================================== ---- src/Games/Makefile.am.orig -+++ src/Games/Makefile.am -@@ -92,11 +92,11 @@ $(TARGET): $(CSFILES) $(RES) +--- gbrainy-2.4.0.orig/src/Games/Makefile.am 2019-01-09 07:03:35.000000000 +0100 ++++ gbrainy-2.4.0/src/Games/Makefile.am 2019-03-20 23:01:36.221865097 +0100 +@@ -113,11 +113,11 @@ $(TARGET): $(CSFILES) $(RES) all: $(TARGET) install-data-local: $(TARGET) @@ -107,11 +107,11 @@ Index: src/Games/Makefile.am EXTRA_DIST = \ $(CSDISTFILES) $(RES) -Index: src/Games/Makefile.in +Index: gbrainy-2.4.0/src/Games/Makefile.in =================================================================== ---- src/Games/Makefile.in.orig -+++ src/Games/Makefile.in -@@ -495,11 +495,11 @@ $(TARGET): $(CSFILES) $(RES) +--- gbrainy-2.4.0.orig/src/Games/Makefile.in 2019-03-19 13:44:07.000000000 +0100 ++++ gbrainy-2.4.0/src/Games/Makefile.in 2019-03-20 23:01:36.221865097 +0100 +@@ -615,11 +615,11 @@ $(TARGET): $(CSFILES) $(RES) all: $(TARGET) install-data-local: $(TARGET) @@ -126,11 +126,11 @@ Index: src/Games/Makefile.in # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -Index: src/Clients/Classical/Makefile.in +Index: gbrainy-2.4.0/src/Clients/Classical/Makefile.in =================================================================== ---- src/Clients/Classical/Makefile.in.orig -+++ src/Clients/Classical/Makefile.in -@@ -274,7 +274,7 @@ RESOURCES = \ +--- gbrainy-2.4.0.orig/src/Clients/Classical/Makefile.in 2019-03-19 13:44:07.000000000 +0100 ++++ gbrainy-2.4.0/src/Clients/Classical/Makefile.in 2019-03-20 23:01:36.221865097 +0100 +@@ -374,7 +374,7 @@ RESOURCES = \ -resource:$(top_srcdir)/data/app-graphics/gtk-stop.svg \ -resource:$(top_srcdir)/data/app-graphics/gtk-ok.svg diff --git a/gbrainy.changes b/gbrainy.changes index 8344dec..85a718b 100644 --- a/gbrainy.changes +++ b/gbrainy.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Mar 20 22:00:24 UTC 2019 - Bjørn Lie + +- Update to version 2.4.0: + + 2 bug fixes in games. + + Several fixes in the build system. + + Updated translations. +- Changes from version 2.3.9: + + 2 bug fixes in games. + + Updated translations. +- Changes from version 2.3.8: + + Fixes bug with librsvg that prevented gbrainy from getting + started. +- Refresh patch with refresh_patches service. +- Remove conditional for t-u-u and macro. + ------------------------------------------------------------------- Fri Oct 5 20:31:10 UTC 2018 - bjorn.lie@gmail.com diff --git a/gbrainy.spec b/gbrainy.spec index 98d7372..c581cb8 100644 --- a/gbrainy.spec +++ b/gbrainy.spec @@ -1,7 +1,7 @@ # # spec file for package gbrainy # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: gbrainy -Version: 2.3.7 +Version: 2.4.0 Release: 0 Summary: A brain teaser game and trainer License: GPL-2.0-or-later @@ -26,6 +26,7 @@ URL: https://wiki.gnome.org/Apps/gbrainy Source: https://gent.softcatala.org/jmas/gbrainy/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE -- gbrainy-use-libexecdir.patch Patch0: gbrainy-use-libexecdir.patch + BuildRequires: fdupes BuildRequires: intltool BuildRequires: pkgconfig @@ -61,18 +62,18 @@ It provides the following types of games: * Verbal analogies. Games that challenge your verbal aptitude. %prep -%setup -q +%autosetup -p1 %if !0%{?is_opensuse} translation-update-upstream -%endif -%patch0 +%endif %lang_package %build export MONO_SHARED_DIR=%{_localstatedir}/tmp %configure \ - --disable-static + --disable-static + %{nil} make %{?_smp_mflags} %install From b758963c687be9cf8791a60ddf45be16bd504fea71f8a36a595ddc5260948bc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sat, 23 Mar 2019 13:17:54 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gbrainy?expand=0&rev=86 --- gbrainy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gbrainy.spec b/gbrainy.spec index c581cb8..5bed19e 100644 --- a/gbrainy.spec +++ b/gbrainy.spec @@ -72,7 +72,7 @@ translation-update-upstream %build export MONO_SHARED_DIR=%{_localstatedir}/tmp %configure \ - --disable-static + --disable-static \ %{nil} make %{?_smp_mflags}