From 8c6ecd328153fda916e8f9f08f37ce26cd83d3da30439529760abe5c73827610 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 5 Dec 2022 08:49:15 +0000 Subject: [PATCH 1/3] Accepting request 1040079 from home:dirkmueller:Factory - update to 2.4.5: * Update translations * PDF save dialog box fixes * Compability with gtk-sharp3-3.22 OBS-URL: https://build.opensuse.org/request/show/1040079 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gbrainy?expand=0&rev=98 --- gbrainy-2.4.4.tar.gz | 3 --- gbrainy-2.4.5.tar.gz | 3 +++ gbrainy.changes | 8 ++++++++ gbrainy.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 gbrainy-2.4.4.tar.gz create mode 100644 gbrainy-2.4.5.tar.gz diff --git a/gbrainy-2.4.4.tar.gz b/gbrainy-2.4.4.tar.gz deleted file mode 100644 index 18c8a99..0000000 --- a/gbrainy-2.4.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f67c220dd04c332260d810c25cb94384cca4547bcf933db3997ac69667457e9 -size 3030763 diff --git a/gbrainy-2.4.5.tar.gz b/gbrainy-2.4.5.tar.gz new file mode 100644 index 0000000..d3b2f51 --- /dev/null +++ b/gbrainy-2.4.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:575207bbdddcdae959efa99e45f27f7d135479e128a7be8cdff3284d361e0b7d +size 3041816 diff --git a/gbrainy.changes b/gbrainy.changes index 04777ac..13ec734 100644 --- a/gbrainy.changes +++ b/gbrainy.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Dec 4 21:55:49 UTC 2022 - Dirk Müller + +- update to 2.4.5: + * Update translations + * PDF save dialog box fixes + * Compability with gtk-sharp3-3.22 + ------------------------------------------------------------------- Thu May 19 06:52:55 UTC 2022 - Dominique Leuenberger diff --git a/gbrainy.spec b/gbrainy.spec index 5ae155c..d6df8f0 100644 --- a/gbrainy.spec +++ b/gbrainy.spec @@ -17,7 +17,7 @@ Name: gbrainy -Version: 2.4.4 +Version: 2.4.5 Release: 0 Summary: A brain teaser game and trainer License: GPL-2.0-or-later From f1dd9779c4a823a0be2fe133f385330816ef997ab501e91fff592537061c238f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 5 Dec 2022 08:49:51 +0000 Subject: [PATCH 2/3] tweak changelog OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gbrainy?expand=0&rev=99 --- gbrainy-use-libexecdir.patch | 141 ----------------------------------- gbrainy.changes | 8 +- gbrainy.spec | 3 +- 3 files changed, 5 insertions(+), 147 deletions(-) delete mode 100644 gbrainy-use-libexecdir.patch diff --git a/gbrainy-use-libexecdir.patch b/gbrainy-use-libexecdir.patch deleted file mode 100644 index c4a3d2e..0000000 --- a/gbrainy-use-libexecdir.patch +++ /dev/null @@ -1,141 +0,0 @@ -Index: gbrainy-2.4.0/src/Clients/Classical/Makefile.am -=================================================================== ---- 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 - --gbrainydir = $(libdir)/gbrainy -+gbrainydir = $(pkglibexecdir) - gbrainy_SCRIPTS = ../../gbrainy.exe ../../gbrainy.exe.config - bin_SCRIPTS = gbrainy - -Index: gbrainy-2.4.0/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 - --prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ -+pkglibexecdir=@libexecdir@/@PACKAGE@ - --MONO_EXE="$libdir/gbrainy/gbrainy.exe" -+MONO_EXE="$pkglibexecdir/gbrainy.exe" - - for arg in $*; do - case "x--debug" in ("x${arg}") -Index: gbrainy-2.4.0/src/Core/Makefile.am -=================================================================== ---- 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 -- sed -e "s|\@pkglibdir\@|$(pkglibdir)|" \ -+ sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" \ - < $< > $@ - - all: $(TARGET) $(TARGET_CFG) - - install-data-local: $(TARGET) $(TARGET_CFG) -- $(mkinstalldirs) $(DESTDIR)$(pkglibdir) -- $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibdir) -- $(INSTALL_DATA) $(TARGET_CFG) $(DESTDIR)$(pkglibdir) -+ $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) -+ $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibexecdir) -+ $(INSTALL_DATA) $(TARGET_CFG) $(DESTDIR)$(pkglibexecdir) - - uninstall-local: -- cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Core.dll -- cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Core.dll.config -+ cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Core.dll -+ cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Core.dll.config - - EXTRA_DIST = \ - $(CSDISTFILES) $(RES) gbrainy.Core.dll.config.in -Index: gbrainy-2.4.0/src/Core/Makefile.in -=================================================================== ---- 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 -- sed -e "s|\@pkglibdir\@|$(pkglibdir)|" \ -+ sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" \ - < $< > $@ - - all: $(TARGET) $(TARGET_CFG) - - install-data-local: $(TARGET) $(TARGET_CFG) -- $(mkinstalldirs) $(DESTDIR)$(pkglibdir) -- $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibdir) -- $(INSTALL_DATA) $(TARGET_CFG) $(DESTDIR)$(pkglibdir) -+ $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) -+ $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibexecdir) -+ $(INSTALL_DATA) $(TARGET_CFG) $(DESTDIR)$(pkglibexecdir) - - uninstall-local: -- cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Core.dll -- cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Core.dll.config -+ cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Core.dll -+ cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Core.dll.config - - # 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: gbrainy-2.4.0/src/Games/Makefile.am -=================================================================== ---- 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) -- $(mkinstalldirs) $(DESTDIR)$(pkglibdir) -- $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibdir) -+ $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) -+ $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibexecdir) - - uninstall-local: -- cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Games.dll -+ cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Games.dll - - EXTRA_DIST = \ - $(CSDISTFILES) $(RES) -Index: gbrainy-2.4.0/src/Games/Makefile.in -=================================================================== ---- 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) -- $(mkinstalldirs) $(DESTDIR)$(pkglibdir) -- $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibdir) -+ $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) -+ $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibexecdir) - - uninstall-local: -- cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Games.dll -+ cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Games.dll - - # 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: gbrainy-2.4.0/src/Clients/Classical/Makefile.in -=================================================================== ---- 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 - --gbrainydir = $(libdir)/gbrainy -+gbrainydir = $(pkglibexecdir) - gbrainy_SCRIPTS = ../../gbrainy.exe ../../gbrainy.exe.config - bin_SCRIPTS = gbrainy - GBRAINY_CSFILES = $(GBRAINY_CSDISTFILES) \ diff --git a/gbrainy.changes b/gbrainy.changes index 13ec734..90a96f4 100644 --- a/gbrainy.changes +++ b/gbrainy.changes @@ -1,10 +1,10 @@ ------------------------------------------------------------------- Sun Dec 4 21:55:49 UTC 2022 - Dirk Müller -- update to 2.4.5: - * Update translations - * PDF save dialog box fixes - * Compability with gtk-sharp3-3.22 +- Update to version 2.4.5: + + PDF save dialog box fixes. + + Compability with gtk-sharp3-3.22. + + Update translations. ------------------------------------------------------------------- Thu May 19 06:52:55 UTC 2022 - Dominique Leuenberger diff --git a/gbrainy.spec b/gbrainy.spec index d6df8f0..1c08b10 100644 --- a/gbrainy.spec +++ b/gbrainy.spec @@ -24,8 +24,6 @@ License: GPL-2.0-or-later Group: Amusements/Games/Logic 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 @@ -71,6 +69,7 @@ translation-update-upstream export MONO_SHARED_DIR=%{_localstatedir}/tmp %configure \ --disable-static \ + --libdir=%{_prefix}/lib %{nil} make %{?_smp_mflags} From d2456e483a2db21e1e4e5c88d310c72cdabfb8ad232d69adfd67b89c4ad9b750 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 5 Dec 2022 08:52:11 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gbrainy?expand=0&rev=100 --- gbrainy-use-libexecdir.patch | 141 +++++++++++++++++++++++++++++++++++ gbrainy.spec | 3 +- 2 files changed, 143 insertions(+), 1 deletion(-) create mode 100644 gbrainy-use-libexecdir.patch diff --git a/gbrainy-use-libexecdir.patch b/gbrainy-use-libexecdir.patch new file mode 100644 index 0000000..c4a3d2e --- /dev/null +++ b/gbrainy-use-libexecdir.patch @@ -0,0 +1,141 @@ +Index: gbrainy-2.4.0/src/Clients/Classical/Makefile.am +=================================================================== +--- 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 + +-gbrainydir = $(libdir)/gbrainy ++gbrainydir = $(pkglibexecdir) + gbrainy_SCRIPTS = ../../gbrainy.exe ../../gbrainy.exe.config + bin_SCRIPTS = gbrainy + +Index: gbrainy-2.4.0/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 + +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-libdir=@libdir@ ++pkglibexecdir=@libexecdir@/@PACKAGE@ + +-MONO_EXE="$libdir/gbrainy/gbrainy.exe" ++MONO_EXE="$pkglibexecdir/gbrainy.exe" + + for arg in $*; do + case "x--debug" in ("x${arg}") +Index: gbrainy-2.4.0/src/Core/Makefile.am +=================================================================== +--- 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 +- sed -e "s|\@pkglibdir\@|$(pkglibdir)|" \ ++ sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" \ + < $< > $@ + + all: $(TARGET) $(TARGET_CFG) + + install-data-local: $(TARGET) $(TARGET_CFG) +- $(mkinstalldirs) $(DESTDIR)$(pkglibdir) +- $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibdir) +- $(INSTALL_DATA) $(TARGET_CFG) $(DESTDIR)$(pkglibdir) ++ $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) ++ $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibexecdir) ++ $(INSTALL_DATA) $(TARGET_CFG) $(DESTDIR)$(pkglibexecdir) + + uninstall-local: +- cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Core.dll +- cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Core.dll.config ++ cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Core.dll ++ cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Core.dll.config + + EXTRA_DIST = \ + $(CSDISTFILES) $(RES) gbrainy.Core.dll.config.in +Index: gbrainy-2.4.0/src/Core/Makefile.in +=================================================================== +--- 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 +- sed -e "s|\@pkglibdir\@|$(pkglibdir)|" \ ++ sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" \ + < $< > $@ + + all: $(TARGET) $(TARGET_CFG) + + install-data-local: $(TARGET) $(TARGET_CFG) +- $(mkinstalldirs) $(DESTDIR)$(pkglibdir) +- $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibdir) +- $(INSTALL_DATA) $(TARGET_CFG) $(DESTDIR)$(pkglibdir) ++ $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) ++ $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibexecdir) ++ $(INSTALL_DATA) $(TARGET_CFG) $(DESTDIR)$(pkglibexecdir) + + uninstall-local: +- cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Core.dll +- cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Core.dll.config ++ cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Core.dll ++ cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Core.dll.config + + # 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: gbrainy-2.4.0/src/Games/Makefile.am +=================================================================== +--- 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) +- $(mkinstalldirs) $(DESTDIR)$(pkglibdir) +- $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibdir) ++ $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) ++ $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibexecdir) + + uninstall-local: +- cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Games.dll ++ cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Games.dll + + EXTRA_DIST = \ + $(CSDISTFILES) $(RES) +Index: gbrainy-2.4.0/src/Games/Makefile.in +=================================================================== +--- 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) +- $(mkinstalldirs) $(DESTDIR)$(pkglibdir) +- $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibdir) ++ $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) ++ $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibexecdir) + + uninstall-local: +- cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Games.dll ++ cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Games.dll + + # 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: gbrainy-2.4.0/src/Clients/Classical/Makefile.in +=================================================================== +--- 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 + +-gbrainydir = $(libdir)/gbrainy ++gbrainydir = $(pkglibexecdir) + gbrainy_SCRIPTS = ../../gbrainy.exe ../../gbrainy.exe.config + bin_SCRIPTS = gbrainy + GBRAINY_CSFILES = $(GBRAINY_CSDISTFILES) \ diff --git a/gbrainy.spec b/gbrainy.spec index 1c08b10..d6df8f0 100644 --- a/gbrainy.spec +++ b/gbrainy.spec @@ -24,6 +24,8 @@ License: GPL-2.0-or-later Group: Amusements/Games/Logic 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 @@ -69,7 +71,6 @@ translation-update-upstream export MONO_SHARED_DIR=%{_localstatedir}/tmp %configure \ --disable-static \ - --libdir=%{_prefix}/lib %{nil} make %{?_smp_mflags}