diff --git a/glu.patch b/glu.patch new file mode 100644 index 0000000..918ba0f --- /dev/null +++ b/glu.patch @@ -0,0 +1,47 @@ +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 diff --git a/gnubg.changes b/gnubg.changes index bcc22cf..6c731eb 100644 --- a/gnubg.changes +++ b/gnubg.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 20 08:16:35 UTC 2013 - cwh@suse.com + +- (Re)Enabled 3d board by fixing GLU linking (oS!=12.3) + ------------------------------------------------------------------- Mon Aug 19 07:50:13 UTC 2013 - cwh@suse.com diff --git a/gnubg.spec b/gnubg.spec index 8b38799..9470692 100644 --- a/gnubg.spec +++ b/gnubg.spec @@ -29,22 +29,25 @@ Source: http://gnubg.org/media/sources/gnubg-release-1.02.000-sources.ta 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 BuildRequires: flex BuildRequires: freetype2-devel BuildRequires: glibc-devel -%if 0%{?suse_version} <= 1220 +%if 0%{?suse_version} != 1230 +BuildRequires: glu-devel BuildRequires: gtkglext-devel %endif +BuildRequires: gmp-devel +BuildRequires: libcanberra-devel BuildRequires: libpng-devel BuildRequires: libtool BuildRequires: python-devel BuildRequires: readline-devel BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(libxml-2.0) BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1120 BuildRequires: libpng-devel >= 1.4 @@ -56,11 +59,9 @@ BuildRequires: update-desktop-files Recommends: gnubg-databases = %{version} Recommends: gnubg-sounds = %{version} Recommends: gnubg-doc = %{version} -BuildRequires: libesd-devel BuildRequires: sqlite3-devel %endif %if 0%{?fedora} -BuildRequires: esound-devel BuildRequires: sqlite-devel %endif @@ -103,9 +104,11 @@ Manual for GNU Backgammon. See description of gnubg for more details. %prep %setup -q gnubg %patch0 -p0 +%patch1 -p1 %build autoreconf -fi +export SUSE_ASNEEDED=1 %configure --docdir=%{_docdir}/%{name} make %{?_smp_mflags}