From cebd9ecb4742491601e329583dff113ebb1c05ee5853fc1f2dd05d9f38d2d228 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 21 Jan 2010 12:03:35 +0000 Subject: [PATCH] Accepting request 29692 from GNOME:Apps Copy from GNOME:Apps/gbrainy based on submit request 29692 from user vuntz OBS-URL: https://build.opensuse.org/request/show/29692 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gbrainy?expand=0&rev=10 --- gbrainy-1.20.tar.bz2 | 3 - gbrainy-1.30.tar.bz2 | 3 + gbrainy-use-libexecdir.patch | 141 +++++++++++++++++++++++++++++++++++ gbrainy.changes | 17 +++++ gbrainy.spec | 36 ++++----- libdir.patch | 26 ------- 6 files changed, 180 insertions(+), 46 deletions(-) delete mode 100644 gbrainy-1.20.tar.bz2 create mode 100644 gbrainy-1.30.tar.bz2 create mode 100644 gbrainy-use-libexecdir.patch delete mode 100644 libdir.patch diff --git a/gbrainy-1.20.tar.bz2 b/gbrainy-1.20.tar.bz2 deleted file mode 100644 index 627d125..0000000 --- a/gbrainy-1.20.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:daa3c3db75ac562c40ffb4300efd8240b1de04ec67bd76fca11a740296c85661 -size 524742 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-use-libexecdir.patch b/gbrainy-use-libexecdir.patch new file mode 100644 index 0000000..c36e72f --- /dev/null +++ b/gbrainy-use-libexecdir.patch @@ -0,0 +1,141 @@ +Index: src/Clients/Classical/Makefile.am +=================================================================== +--- src/Clients/Classical/Makefile.am.orig ++++ src/Clients/Classical/Makefile.am +@@ -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 + bin_SCRIPTS = gbrainy + +Index: src/Clients/Classical/gbrainy.in +=================================================================== +--- src/Clients/Classical/gbrainy.in.orig ++++ src/Clients/Classical/gbrainy.in +@@ -1,10 +1,8 @@ + #!/bin/bash + +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-libdir=@libdir@ ++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 +@@ -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)|" \ ++ 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 = \ + $(CSFILES) $(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) + + $(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: src/Games/Makefile.am +=================================================================== +--- src/Games/Makefile.am.orig ++++ src/Games/Makefile.am +@@ -88,11 +88,11 @@ $(TARGET): $(SRCDIR_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 = \ + $(CSFILES) $(RES) +Index: src/Games/Makefile.in +=================================================================== +--- src/Games/Makefile.in.orig ++++ src/Games/Makefile.in +@@ -491,11 +491,11 @@ $(TARGET): $(SRCDIR_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. diff --git a/gbrainy.changes b/gbrainy.changes index b26b7e0..dcb3399 100644 --- a/gbrainy.changes +++ b/gbrainy.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Fri Jan 8 21:17:16 CET 2010 - vuntz@opensuse.org + +- Update to version 1.30: + + Re-architectured for better multiplatform support + + Personal records tracking + + Improved player scoring algorithm + + Better accessibility + + 9 new verbal analogies and a new logic puzzle + + Mallard documentation + + More HIG compliance + + Bug fixes +- Add gnome-doc-utils-devel BuildRequires. +- Rename libdir.patch to gbrainy-use-libexecdir.patch, and rebase + it. Also add Makefile.in changes there so that we don't need to + call autoreconf. + ------------------------------------------------------------------- Wed Dec 2 01:02:11 CET 2009 - vuntz@opensuse.org diff --git a/gbrainy.spec b/gbrainy.spec index 90e8fa0..d322588 100644 --- a/gbrainy.spec +++ b/gbrainy.spec @@ -1,7 +1,7 @@ # -# spec file for package gbrainy (Version 1.20) +# spec file for package gbrainy (Version 1.30) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,22 +19,23 @@ Name: gbrainy -Version: 1.20 +Version: 1.30 Release: 1 License: GPLv2+ Source: %{name}-%{version}.tar.bz2 -Patch: libdir.patch +Patch: gbrainy-use-libexecdir.patch PreReq: filesystem Url: http://live.gnome.org/gbrainy BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: gnome-doc-utils-devel BuildRequires: gtk-sharp2 BuildRequires: intltool BuildRequires: librsvg-devel BuildRequires: mono-devel BuildRequires: mono-addins Group: Amusements/Games/Logic -Summary: A brain teaser game and trainer to have fun and to keep your brain trained +Summary: A brain teaser game and trainer %if 0%{?suse_version} BuildRequires: glade-sharp2 gnome-sharp2 BuildRequires: update-desktop-files @@ -46,16 +47,21 @@ BuildRequires: gnome-sharp-devel gtk-sharp2-devel %endif %description -gbrainy is a brain teaser game and trainer to have fun and to keep your -brain trained. +gbrainy is a brain teaser game and trainer to have fun and to keep +your brain trained. -It provides the following types of games: * Logic puzzles. Games - designed to challenge your reasoning and thinking skills. +It provides the following types of games: + +* Logic puzzles. Games designed to challenge your reasoning and + thinking skills. * Mental calculation. Games based on arithmetical operations - designed to prove your mental calculation skills. + designed to prove your mental calculation skills. -* Memory trainers. Games designed to challenge your short term memory. +* Memory trainers. Games designed to challenge your short term + memory. + +* Verbal analogies. Games that challenge your verbal aptitude. %prep %setup -q @@ -63,7 +69,6 @@ It provides the following types of games: * Logic puzzles. Games %build export MONO_SHARED_DIR=/var/tmp -autoreconf %configure --disable-static make @@ -82,12 +87,9 @@ rm -rf "$RPM_BUILD_ROOT" %defattr(-,root,root) %doc AUTHORS NEWS README COPYING %{_bindir}/gbrainy -%dir %{_prefix}/lib/gbrainy -%{_prefix}/lib/gbrainy/gbrainy.exe -%{_prefix}/lib/gbrainy/gbrainy.exe.config -%dir %{_datadir}/games/gbrainy +%{_libexecdir}/gbrainy/ +%{_datadir}/games/gbrainy/ %{_datadir}/applications/gbrainy.desktop -%{_datadir}/games/gbrainy/* %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/man/man6/gbrainy.6.gz diff --git a/libdir.patch b/libdir.patch deleted file mode 100644 index 62ff8da..0000000 --- a/libdir.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: src/gbrainy.in -=================================================================== ---- src/gbrainy.in.orig 2009-08-20 22:34:52.000000000 +0200 -+++ src/gbrainy.in 2009-12-01 13:49:08.862712000 +0100 -@@ -2,7 +2,7 @@ - - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ -+libdir=@prefix@/lib - - MONO_EXE="$libdir/gbrainy/gbrainy.exe" - -Index: src/Makefile.am -=================================================================== ---- src/Makefile.am.orig 2009-08-20 22:37:18.000000000 +0200 -+++ src/Makefile.am 2009-12-01 13:49:08.869712000 +0100 -@@ -98,7 +98,7 @@ RESOURCES = \ - -resource:$(top_srcdir)/data/game-graphics/handshake.svg \ - -resource:$(srcdir)/gbrainy.addin.xml - --gbrainydir = $(libdir)/gbrainy -+gbrainydir = $(prefix)/lib/gbrainy - gbrainy_SCRIPTS = gbrainy.exe ../data/gbrainy.exe.config - bin_SCRIPTS = gbrainy -