Accepting request 243866 from games

Again

OBS-URL: https://build.opensuse.org/request/show/243866
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnubg?expand=0&rev=7
This commit is contained in:
Ludwig Nussel 2014-08-08 08:10:30 +00:00 committed by Git OBS Bridge
commit fef23fcf5e
6 changed files with 20 additions and 81 deletions

View File

@ -1,23 +0,0 @@
--- Makefile.am.orig 2013-07-25 16:53:18.726563373 +0200
+++ Makefile.am 2013-07-25 16:56:08.687492289 +0200
@@ -27,7 +27,7 @@
AM_CPPFLAGS += @PYTHON_INCLUDES@
endif
-AM_CPPFLAGS += -DAC_DOCDIR='"$(datadir)/doc/gnubg/"' -DAC_DATADIR='"$(datadir)"' -DAC_PKGDATADIR='"$(datadir)/gnubg"'
+AM_CPPFLAGS += -DAC_DOCDIR='"$(docdir)/doc/gnubg/"' -DAC_DATADIR='"$(datadir)"' -DAC_PKGDATADIR='"$(datadir)/gnubg"'
OTHER_LIBS =
if WIN32
--- doc/Makefile.am.orig 2013-07-25 16:57:09.270821442 +0200
+++ doc/Makefile.am 2013-07-25 17:00:11.901814264 +0200
@@ -1,6 +1,6 @@
-AM_CPPFLAGS = -DAC_DOCDIR='"$(datadir)/doc/gnubg/"' -DAC_DATADIR='"$(datadir)"' -DAC_PKGDATADIR='"$(datadir)/gnubg"'
-gnubg_helpdir = $(datadir)/doc/gnubg/
-gnubg_imagedir = $(datadir)/doc/gnubg/images
+AM_CPPFLAGS = -DAC_DOCDIR='"$(docdir)"' -DAC_DATADIR='"$(datadir)"' -DAC_PKGDATADIR='"$(datadir)/gnubg"'
+gnubg_helpdir = $(docdir)
+gnubg_imagedir = $(docdir)/images
gnubg_help_DATA = gnubg.html allabout.html
gnubg_image_DATA = images/1540d81e.png images/16d7944c.png images/1805dc7d.png \
images/20bc52ca.png images/20d56757.png images/234924dc.png images/26e34ea5.png \

View File

@ -1,47 +0,0 @@
Index: gnubg-1.02.000/Makefile.am
===================================================================
--- gnubg-1.02.000.orig/Makefile.am
+++ gnubg-1.02.000/Makefile.am
@@ -161,7 +161,7 @@ if USE_PYTHON
gnubg_LDADD += @PYTHON_LIBS@
endif
if USE_BOARD3D
-gnubg_LDADD += -L$(srcdir)/board3d board3d/libboard3d.la @GTKGLEXT_LIBS@
+gnubg_LDADD += -L$(srcdir)/board3d board3d/libboard3d.la $(GTKGLEXT_LIBS) $(GLU_LIBS)
endif
if WIN32
Index: gnubg-1.02.000/board3d/Makefile.am
===================================================================
--- gnubg-1.02.000.orig/board3d/Makefile.am
+++ gnubg-1.02.000/board3d/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = -I$(srcdir)/.. $(COMMON_IN
-I$(srcdir)/../lib \
-DLOCALEDIR=\"$(localedir)\" \
-DAC_DATADIR='"$(datadir)"' -DAC_PKGDATADIR=='"$(datadir)/gnubg"'\
- @FREETYPE2_CFLAGS@ @GTKGLEXT_CFLAGS@
+ @FREETYPE2_CFLAGS@ @GTKGLEXT_CFLAGS@ $(GLU_CFLAGS)
if USE_BOARD3D
noinst_LTLIBRARIES = libboard3d.la
Index: gnubg-1.02.000/configure.ac
===================================================================
--- gnubg-1.02.000.orig/configure.ac
+++ gnubg-1.02.000/configure.ac
@@ -130,6 +130,7 @@ PKG_CHECK_MODULES(LIBPNG, [libpng >= 1.2
PKG_CHECK_MODULES(CAIRO, [cairo >= 1.2], have_cairo="yes", [AC_MSG_WARN([no cairo support])])
PKG_CHECK_MODULES(PANGOCAIRO, [pangocairo >= 1.0], have_pangocairo="yes", [AC_MSG_WARN([no pangocairo support])])
PKG_CHECK_MODULES(SQLITE, [sqlite3], have_sqlite="yes", AC_MSG_WARN([no sqlite support]))
+PKG_CHECK_MODULES(GLU, [glu], have_glu="yes", AC_MSG_WARN([no glu support]))
if test "x$win32" != "xyes"; then
PKG_CHECK_MODULES(CANBERRA, [libcanberra-gtk], have_canberra="yes", AC_MSG_WARN([no libcanberra-gtk support]))
@@ -302,7 +303,7 @@ fi
AC_CHECK_HEADERS(GL/glx.h)
-if test "$with_board3d" != "no" && test "$with_gtk" != "no" && test "x$have_gtk" = "xyes" && test "x$have_gtkglext" = "xyes"; then
+if test "$with_board3d" != "no" && test "$with_gtk" != "no" && test "x$have_gtk" = "xyes" && test "x$have_gtkglext" = "xyes" -a "x$have_glu" = "xyes"; then
AC_DEFINE(USE_BOARD3D,1, [Define if you want to use the 3d boards])
no_board3d="no"
fi

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7ece7fc02481f8e6c08869306f1cf52cad9ec5ddd675de67782cf028a6dcb504
size 14985346

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:609f66323dd20fcaa2e1f889b70f8453b5c53999a8c5afda971c131bcfa0e4f0
size 15019572

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Aug 5 13:02:34 UTC 2014 - cwh@suse.com
- 1.03.000
- added recommends: python-MySQL-python
- removed patches docdir.patch and glu.patch since these things
are now fixed upstream.
-------------------------------------------------------------------
Wed Sep 18 08:28:30 UTC 2013 - cwh@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package gnubg
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2003 Achim Mueller, Germany.
# Updated by Christopher Hofmann in 2010
#
@ -19,17 +19,14 @@
Name: gnubg
Version: 1.02.000
Version: 1.03.000
Release: 0
Summary: Plays and analyzes backgammon games and matches on a world class level
License: GPL-3.0+
Group: Amusements/Games/Board/Other
Url: http://www.gnubg.org
Source: http://gnubg.org/media/sources/gnubg-release-1.02.000-sources.tar.gz
Source: http://gnubg.org/media/sources/gnubg-release-%{version}-sources.tar.gz
Source1: %{name}.desktop
# PATCH-FIX-UPSTREAM docdir.patch cwh@suse.de -- install documentation to a LSB conform place
Patch0: docdir.patch
Patch1: glu.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
@ -59,6 +56,7 @@ BuildRequires: update-desktop-files
Recommends: gnubg-databases = %{version}
Recommends: gnubg-sounds = %{version}
Recommends: gnubg-doc = %{version}
Recommends: python-MySQL-python
BuildRequires: sqlite3-devel
%endif
%if 0%{?fedora}
@ -103,8 +101,6 @@ Manual for GNU Backgammon. See description of gnubg for more details.
%prep
%setup -q gnubg
%patch0 -p0
%patch1 -p1
%build
autoreconf -fi
@ -127,6 +123,11 @@ install -m 0644 $DOC %{buildroot}/%{_docdir}/%{name}/
%defattr(-,root,root)
%{_bindir}/*
%{_mandir}/man?/%{name}*
%{_mandir}/man?/bearoffdump.*
%{_mandir}/man?/makebearoff.*
%{_mandir}/man?/makehyper.*
%{_mandir}/man?/makeweights.*
%if 0%{?suse_version}
%{_datadir}/applications/gnubg.desktop
%endif