From c9605c7c8937907e789c7f8e7c1e7e6ca2b14497f4f5f75a8252bde395e6e9cd Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 5 Mar 2010 11:09:53 +0000 Subject: [PATCH] Accepting request 33797 from GNOME:Apps checked in (request 33797) OBS-URL: https://build.opensuse.org/request/show/33797 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gbrainy?expand=0&rev=9 --- gbrainy-1.30.tar.bz2 | 3 +++ gbrainy-1.40.tar.bz2 | 3 --- gbrainy-use-libexecdir.patch | 48 ++++++++++++++++++------------------ gbrainy.changes | 13 ---------- gbrainy.spec | 6 ++--- 5 files changed, 29 insertions(+), 44 deletions(-) create mode 100644 gbrainy-1.30.tar.bz2 delete mode 100644 gbrainy-1.40.tar.bz2 diff --git a/gbrainy-1.30.tar.bz2 b/gbrainy-1.30.tar.bz2 new file mode 100644 index 0000000..1f06e1e --- /dev/null +++ b/gbrainy-1.30.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0e58983428786d203d902d7e127a7851588ce1db7f0ba99bcbd66e7db42c2eb +size 932050 diff --git a/gbrainy-1.40.tar.bz2 b/gbrainy-1.40.tar.bz2 deleted file mode 100644 index 9ef11fa..0000000 --- a/gbrainy-1.40.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0cc7d187335920e69c2b9cb79cd5260ed40db3e2375412a7eb3d11b9f841bea7 -size 1025006 diff --git a/gbrainy-use-libexecdir.patch b/gbrainy-use-libexecdir.patch index b828b74..c36e72f 100644 --- a/gbrainy-use-libexecdir.patch +++ b/gbrainy-use-libexecdir.patch @@ -2,13 +2,13 @@ Index: src/Clients/Classical/Makefile.am =================================================================== --- src/Clients/Classical/Makefile.am.orig +++ src/Clients/Classical/Makefile.am -@@ -41,7 +41,7 @@ RESOURCES = \ +@@ -34,7 +34,7 @@ RESOURCES = \ -resource:$(top_srcdir)/data/app-graphics/verbal-games-32.png \ -resource:$(top_srcdir)/data/app-graphics/gbrainy.svg -gbrainydir = $(libdir)/gbrainy +gbrainydir = $(pkglibexecdir) - gbrainy_SCRIPTS = ../../gbrainy.exe ../../gbrainy.exe.config + gbrainy_SCRIPTS = ../../gbrainy.exe bin_SCRIPTS = gbrainy Index: src/Clients/Classical/gbrainy.in @@ -21,19 +21,32 @@ Index: src/Clients/Classical/gbrainy.in -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -+pkglibexecdir=@libexecdir@ ++pkglibexecdir=@pkglibexecdir@ -MONO_EXE="$libdir/gbrainy/gbrainy.exe" +MONO_EXE="$pkglibexecdir/gbrainy.exe" for arg in $*; do case "x--debug" in ("x${arg}") +Index: src/Clients/Classical/Makefile.in +=================================================================== +--- src/Clients/Classical/Makefile.in.orig ++++ src/Clients/Classical/Makefile.in +@@ -267,7 +267,7 @@ RESOURCES = \ + -resource:$(top_srcdir)/data/app-graphics/verbal-games-32.png \ + -resource:$(top_srcdir)/data/app-graphics/gbrainy.svg + +-gbrainydir = $(libdir)/gbrainy ++gbrainydir = $(pkglibexecdir) + gbrainy_SCRIPTS = ../../gbrainy.exe + bin_SCRIPTS = gbrainy + GBRAINY_CSFILES = $(GBRAINY_CSDISTFILES) \ Index: src/Core/Makefile.am =================================================================== --- src/Core/Makefile.am.orig +++ src/Core/Makefile.am -@@ -69,19 +69,19 @@ $(TARGET): $(CSFILES) $(RES) - $(CSC) -out:$@ $(CSFLAGS) $(REFS) $(RES_CSFLAGS) $(CSFILES) +@@ -58,19 +58,19 @@ $(TARGET): $(SRCDIR_CSFILES) $(RES) + $(CSC) -out:$@ $(CSFLAGS) $(REFS) $(RES_CSFLAGS) $(SRCDIR_CSFILES) $(TARGET_CFG): $(srcdir)/gbrainy.Core.dll.config.in - sed -e "s|\@pkglibdir\@|$(pkglibdir)|" \ @@ -57,13 +70,13 @@ Index: src/Core/Makefile.am + cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Core.dll.config EXTRA_DIST = \ - $(CSDISTFILES) $(RES) gbrainy.Core.dll.config.in + $(CSFILES) $(RES) gbrainy.Core.dll.config.in Index: src/Core/Makefile.in =================================================================== --- src/Core/Makefile.in.orig +++ src/Core/Makefile.in -@@ -472,19 +472,19 @@ $(TARGET): $(CSFILES) $(RES) - $(CSC) -out:$@ $(CSFLAGS) $(REFS) $(RES_CSFLAGS) $(CSFILES) +@@ -461,19 +461,19 @@ $(TARGET): $(SRCDIR_CSFILES) $(RES) + $(CSC) -out:$@ $(CSFLAGS) $(REFS) $(RES_CSFLAGS) $(SRCDIR_CSFILES) $(TARGET_CFG): $(srcdir)/gbrainy.Core.dll.config.in - sed -e "s|\@pkglibdir\@|$(pkglibdir)|" \ @@ -92,7 +105,7 @@ Index: src/Games/Makefile.am =================================================================== --- src/Games/Makefile.am.orig +++ src/Games/Makefile.am -@@ -92,11 +92,11 @@ $(TARGET): $(CSFILES) $(RES) +@@ -88,11 +88,11 @@ $(TARGET): $(SRCDIR_CSFILES) $(RES) all: $(TARGET) install-data-local: $(TARGET) @@ -106,12 +119,12 @@ Index: src/Games/Makefile.am + cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Games.dll EXTRA_DIST = \ - $(CSDISTFILES) $(RES) + $(CSFILES) $(RES) Index: src/Games/Makefile.in =================================================================== --- src/Games/Makefile.in.orig +++ src/Games/Makefile.in -@@ -495,11 +495,11 @@ $(TARGET): $(CSFILES) $(RES) +@@ -491,11 +491,11 @@ $(TARGET): $(SRCDIR_CSFILES) $(RES) all: $(TARGET) install-data-local: $(TARGET) @@ -126,16 +139,3 @@ 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 -=================================================================== ---- src/Clients/Classical/Makefile.in.orig -+++ src/Clients/Classical/Makefile.in -@@ -274,7 +274,7 @@ RESOURCES = \ - -resource:$(top_srcdir)/data/app-graphics/verbal-games-32.png \ - -resource:$(top_srcdir)/data/app-graphics/gbrainy.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 f33c579..dcb3399 100644 --- a/gbrainy.changes +++ b/gbrainy.changes @@ -1,16 +1,3 @@ -------------------------------------------------------------------- -Mon Mar 1 12:23:31 CET 2010 - dimstar@opensuse.org - -- Update to version 1.40: - + 2 new logic games - + Deprecated Glade and moved to Builder - + Mouse support - + Better RTL support - + Updated and new translations - + Remove dead and legacy code - + 12 Bug fixes -- Rebase gbrainy-use-libexecdir.patch. - ------------------------------------------------------------------- Fri Jan 8 21:17:16 CET 2010 - vuntz@opensuse.org diff --git a/gbrainy.spec b/gbrainy.spec index 439f0f1..d322588 100644 --- a/gbrainy.spec +++ b/gbrainy.spec @@ -1,5 +1,5 @@ # -# spec file for package gbrainy (Version 1.40) +# spec file for package gbrainy (Version 1.30) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: gbrainy -Version: 1.40 +Version: 1.30 Release: 1 License: GPLv2+ Source: %{name}-%{version}.tar.bz2 @@ -79,8 +79,6 @@ make rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps # It's not the right size: 32x32 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gbrainy.png -# There are no extensions yet, Thus creating a -devel package sounds overkill (file can't reside in noarch package). -rm %{buildroot}%{_libdir}/pkgconfig/gbrainy.pc %clean rm -rf "$RPM_BUILD_ROOT"