From 08f3efb1e793fea07ab2d9be68d80cbd880ea84a9779968c1094c44b50cd50e9 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 2 Apr 2010 21:23:53 +0000 Subject: [PATCH] Accepting request 36835 from home:vuntz:branches:GNOME:Apps Copy from home:vuntz:branches:GNOME:Apps/gbrainy via accept of submit request 36835 revision 2. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/36835 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gbrainy?expand=0&rev=10 --- gbrainy-1.30.tar.bz2 | 3 --- gbrainy-1.41.tar.bz2 | 3 +++ gbrainy-use-libexecdir.patch | 48 ++++++++++++++++++------------------ gbrainy.changes | 20 +++++++++++++++ gbrainy.spec | 6 +++-- ready | 0 6 files changed, 51 insertions(+), 29 deletions(-) delete mode 100644 gbrainy-1.30.tar.bz2 create mode 100644 gbrainy-1.41.tar.bz2 delete mode 100644 ready diff --git a/gbrainy-1.30.tar.bz2 b/gbrainy-1.30.tar.bz2 deleted file mode 100644 index 1f06e1e..0000000 --- a/gbrainy-1.30.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d0e58983428786d203d902d7e127a7851588ce1db7f0ba99bcbd66e7db42c2eb -size 932050 diff --git a/gbrainy-1.41.tar.bz2 b/gbrainy-1.41.tar.bz2 new file mode 100644 index 0000000..a9cd55c --- /dev/null +++ b/gbrainy-1.41.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15072cfc4f4d78be52b2dd17c0e9f0cfa44bdcce44afbde2a8b0efb6791b25aa +size 1053277 diff --git a/gbrainy-use-libexecdir.patch b/gbrainy-use-libexecdir.patch index c36e72f..b828b74 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 -@@ -34,7 +34,7 @@ RESOURCES = \ +@@ -41,7 +41,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_SCRIPTS = ../../gbrainy.exe ../../gbrainy.exe.config bin_SCRIPTS = gbrainy Index: src/Clients/Classical/gbrainy.in @@ -21,32 +21,19 @@ Index: src/Clients/Classical/gbrainy.in -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -+pkglibexecdir=@pkglibexecdir@ ++pkglibexecdir=@libexecdir@ -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 -@@ -58,19 +58,19 @@ $(TARGET): $(SRCDIR_CSFILES) $(RES) - $(CSC) -out:$@ $(CSFLAGS) $(REFS) $(RES_CSFLAGS) $(SRCDIR_CSFILES) +@@ -69,19 +69,19 @@ $(TARGET): $(CSFILES) $(RES) + $(CSC) -out:$@ $(CSFLAGS) $(REFS) $(RES_CSFLAGS) $(CSFILES) $(TARGET_CFG): $(srcdir)/gbrainy.Core.dll.config.in - sed -e "s|\@pkglibdir\@|$(pkglibdir)|" \ @@ -70,13 +57,13 @@ Index: src/Core/Makefile.am + cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Core.dll.config EXTRA_DIST = \ - $(CSFILES) $(RES) gbrainy.Core.dll.config.in + $(CSDISTFILES) $(RES) gbrainy.Core.dll.config.in Index: src/Core/Makefile.in =================================================================== --- src/Core/Makefile.in.orig +++ src/Core/Makefile.in -@@ -461,19 +461,19 @@ $(TARGET): $(SRCDIR_CSFILES) $(RES) - $(CSC) -out:$@ $(CSFLAGS) $(REFS) $(RES_CSFLAGS) $(SRCDIR_CSFILES) +@@ -472,19 +472,19 @@ $(TARGET): $(CSFILES) $(RES) + $(CSC) -out:$@ $(CSFLAGS) $(REFS) $(RES_CSFLAGS) $(CSFILES) $(TARGET_CFG): $(srcdir)/gbrainy.Core.dll.config.in - sed -e "s|\@pkglibdir\@|$(pkglibdir)|" \ @@ -105,7 +92,7 @@ Index: src/Games/Makefile.am =================================================================== --- src/Games/Makefile.am.orig +++ src/Games/Makefile.am -@@ -88,11 +88,11 @@ $(TARGET): $(SRCDIR_CSFILES) $(RES) +@@ -92,11 +92,11 @@ $(TARGET): $(CSFILES) $(RES) all: $(TARGET) install-data-local: $(TARGET) @@ -119,12 +106,12 @@ Index: src/Games/Makefile.am + cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Games.dll EXTRA_DIST = \ - $(CSFILES) $(RES) + $(CSDISTFILES) $(RES) Index: src/Games/Makefile.in =================================================================== --- src/Games/Makefile.in.orig +++ src/Games/Makefile.in -@@ -491,11 +491,11 @@ $(TARGET): $(SRCDIR_CSFILES) $(RES) +@@ -495,11 +495,11 @@ $(TARGET): $(CSFILES) $(RES) all: $(TARGET) install-data-local: $(TARGET) @@ -139,3 +126,16 @@ 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 dcb3399..7872b73 100644 --- a/gbrainy.changes +++ b/gbrainy.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Apr 2 22:37:21 CEST 2010 - vuntz@opensuse.org + +- Update to version 1.41: + + 18 bug fixes + + Updated translations. + +------------------------------------------------------------------- +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 d322588..905f1c4 100644 --- a/gbrainy.spec +++ b/gbrainy.spec @@ -1,5 +1,5 @@ # -# spec file for package gbrainy (Version 1.30) +# spec file for package gbrainy (Version 1.41) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: gbrainy -Version: 1.30 +Version: 1.41 Release: 1 License: GPLv2+ Source: %{name}-%{version}.tar.bz2 @@ -79,6 +79,8 @@ 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" diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000