rpm/gbrainy
SHA256
1
0
Fork 0
forked from pool/gbrainy
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gbrainy?expand=0&rev=100

Browse Source
This commit is contained in:
Dominique Leuenberger 2022-12-05 08:52:11 +00:00 committed by Git OBS Bridge
parent 16271bd624
commit e86f2d0cca
2 changed files with 143 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
gbrainy-use-libexecdir.patch Normal file
View File

@ -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) \

3
gbrainy.spec
View File

@ -24,6 +24,8 @@ License: GPL-2.0-or-later
Group: Amusements/Games/Logic Group: Amusements/Games/Logic
URL: https://wiki.gnome.org/Apps/gbrainy URL: https://wiki.gnome.org/Apps/gbrainy
Source: https://gent.softcatala.org/jmas/gbrainy/%{name}-%{version}.tar.gz 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: fdupes
BuildRequires: intltool BuildRequires: intltool
@ -69,7 +71,6 @@ translation-update-upstream
export MONO_SHARED_DIR=%{_localstatedir}/tmp export MONO_SHARED_DIR=%{_localstatedir}/tmp
%configure \ %configure \
--disable-static \ --disable-static \
--libdir=%{_prefix}/lib
%{nil} %{nil}
make %{?_smp_mflags} make %{?_smp_mflags}