From 48e4d3e2d6d1410c1745af41df5ca00edae27f52655da3093b3f4f3f5837a7f7 Mon Sep 17 00:00:00 2001 From: Christopher Hofmann Date: Thu, 19 Jul 2012 12:55:14 +0000 Subject: [PATCH] Accepting request 128360 from home:cwh Packaging snapshots because of no upstream release OBS-URL: https://build.opensuse.org/request/show/128360 OBS-URL: https://build.opensuse.org/package/show/games/gnubg?expand=0&rev=5 --- configure.in_libpngversion.patch | 11 ---- docdir.patch | 23 ++++++++ export.c_libpng14.patch | 13 ---- gnubg-0.9.0-1.tar.gz | 3 - gnubg-source-SNAPSHOT-20120711.tar.bz2 | 3 + gnubg.changes | 45 +++++++++++--- gnubg.desktop | 9 +++ gnubg.spec | 82 ++++++++++++++++++-------- gnubgmodule_bufferoverflow.patch | 20 ------- 9 files changed, 129 insertions(+), 80 deletions(-) delete mode 100644 configure.in_libpngversion.patch create mode 100644 docdir.patch delete mode 100644 export.c_libpng14.patch delete mode 100644 gnubg-0.9.0-1.tar.gz create mode 100644 gnubg-source-SNAPSHOT-20120711.tar.bz2 create mode 100644 gnubg.desktop delete mode 100644 gnubgmodule_bufferoverflow.patch diff --git a/configure.in_libpngversion.patch b/configure.in_libpngversion.patch deleted file mode 100644 index 872a09a..0000000 --- a/configure.in_libpngversion.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in 2008-03-28 20:28:03.000000000 +0100 -+++ configure.in.new 2010-05-19 12:04:47.000000000 +0200 -@@ -96,7 +96,7 @@ - PKG_CHECK_MODULES(GTHREAD, [gthread-2.0], have_gthread="yes", [AC_MSG_WARN("No thread support in glib")]) - PKG_CHECK_MODULES(LIBXML2, libxml-2.0, AC_DEFINE(HAVE_LIBXML2,1,Define if you want to use libxml2 to parse XML.), []) - PKG_CHECK_MODULES(FREETYPE2, [freetype2], AC_DEFINE(HAVE_FREETYPE, 1, Define if you have freetype2), []) --PKG_CHECK_MODULES(LIBPNG, [libpng12], AC_DEFINE(HAVE_LIBPNG, 1, Define if you have libpng), []) -+PKG_CHECK_MODULES(LIBPNG, [libpng14], AC_DEFINE(HAVE_LIBPNG, 1, Define if you have libpng), []) - PKG_CHECK_MODULES(ESD, [esound], AC_DEFINE(HAVE_ESD, 1, Define if you have esound), [AC_MSG_WARN("No esound support")]) - PKG_CHECK_MODULES(CAIRO, [cairo >= 1.2], AC_DEFINE(HAVE_CAIRO,1,Define if you want to use libcairo), [AC_MSG_WARN("No cairo support")]) - PKG_CHECK_MODULES(PANGOCAIRO, [pangocairo >= 1.0], AC_DEFINE(HAVE_PANGOCAIRO,1,Define if you want to use pangocairo), [AC_MSG_WARN("No pangocairo support")]) diff --git a/docdir.patch b/docdir.patch new file mode 100644 index 0000000..5325beb --- /dev/null +++ b/docdir.patch @@ -0,0 +1,23 @@ +--- Makefile.am.orig 2012-07-11 14:29:53.000000000 +0200 ++++ Makefile.am 2012-07-11 14:30:48.000000000 +0200 +@@ -2,7 +2,7 @@ + + ACLOCAL_AMFLAGS = -I m4 + +-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"' + + SUBDIRS = lib doc met po m4 sounds board3d textures scripts flags fonts non-src pixmaps . + +--- doc/Makefile.am.orig 2012-07-11 14:29:56.000000000 +0200 ++++ doc/Makefile.am 2012-07-11 14:32:24.000000000 +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 \ diff --git a/export.c_libpng14.patch b/export.c_libpng14.patch deleted file mode 100644 index d5454b1..0000000 --- a/export.c_libpng14.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- export.c 2008-03-14 07:20:05.000000000 +0100 -+++ export.c.new 2010-05-19 13:39:20.000000000 +0200 -@@ -516,8 +516,8 @@ - atext[1].compression = PNG_TEXT_COMPRESSION_NONE; - - #ifdef PNG_iTXt_SUPPORTED -- text_ptr[0].lang = NULL; -- text_ptr[1].lang = NULL; -+ atext[0].lang = NULL; -+ atext[1].lang = NULL; - #endif - png_set_text (ppng, pinfo, atext, 2); - diff --git a/gnubg-0.9.0-1.tar.gz b/gnubg-0.9.0-1.tar.gz deleted file mode 100644 index b79c857..0000000 --- a/gnubg-0.9.0-1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a529d6a4adb67601599655ce2603f57622919753dc45774f69bebe696220287a -size 16279912 diff --git a/gnubg-source-SNAPSHOT-20120711.tar.bz2 b/gnubg-source-SNAPSHOT-20120711.tar.bz2 new file mode 100644 index 0000000..a453e8e --- /dev/null +++ b/gnubg-source-SNAPSHOT-20120711.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97724b39ec700cb6de59cd005907905bf3d5dde08cf120f9b2deeae8c86f34cc +size 13690697 diff --git a/gnubg.changes b/gnubg.changes index 09675f4..ab215a8 100644 --- a/gnubg.changes +++ b/gnubg.changes @@ -1,15 +1,46 @@ ------------------------------------------------------------------- -Wed May 30 12:32:15 UTC 2012 - joop.boonen@opensuse.org +Wed Jul 11 11:07:15 UTC 2012 - cwh@suse.com -- Added missing Build requires automake and libtool -- Cleaned the spec file up +- updated to snapshot 20120711 +- cleaned specfile ------------------------------------------------------------------- -Sat Jul 2 13:18:26 UTC 2011 - jengelh@medozas.de +Tue Mar 1 16:24:02 UTC 2011 - cwh@novell.com -- Remove conflicting %debug_package: OBS deals with that already -- Remove unnecessary %clean section -- Use %_smp_mflags +- updated to snapshot 20110301 + +------------------------------------------------------------------- +Tue Aug 17 12:07:10 UTC 2010 - cwh@novell.com + +- updated to snapshot 20100817 + +------------------------------------------------------------------- +Mon Aug 2 15:15:15 UTC 2010 - cwh@novell.com + +- updated to snapshot 20100802 + +------------------------------------------------------------------- +Tue Jun 22 12:01:35 UTC 2010 - cwh@novell.com + +- updated to snapshot 20100622 + +------------------------------------------------------------------- +Tue Jun 15 17:31:51 UTC 2010 - cwh@novell.com + +- let doc going to proper docdir + +------------------------------------------------------------------- +Sat Jun 12 13:10:43 UTC 2010 - cwh@novell.com + +- moved desktop file out of the spec file +- updated to most recent svn snapshot + +------------------------------------------------------------------- +Tue Jun 1 10:36:26 UTC 2010 - cwh@novell.com + +- imported patch from upstream: + - made used libpngversion more flexible + - better fix for buffer overflow ------------------------------------------------------------------- Fri May 28 15:11:59 UTC 2010 - cwh@novell.com diff --git a/gnubg.desktop b/gnubg.desktop new file mode 100644 index 0000000..da4784f --- /dev/null +++ b/gnubg.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Categories=Game;BoardGame; +Encoding=UTF-8 +Name=GNU Backgammon +GenericName=Backgammon Board Game +Type=Application +Exec=gnubg -w +Icon=gnubg.png + diff --git a/gnubg.spec b/gnubg.spec index fda6573..eaf4a5a 100644 --- a/gnubg.spec +++ b/gnubg.spec @@ -19,13 +19,18 @@ Name: gnubg -Version: 0.9.0 +%define timestamp 20120711 +Version: 0.9.0.99_%{timestamp} Release: 0 +License: GPL-3.0 Summary: Plays and analyzes backgammon games and matches on a world class level -License: GPL-1.0+ -Group: Amusements/Games/Board/Other Url: http://www.gnubg.org -Source: %{name}-%{version}-1.tar.gz +Group: Amusements/Games/Board/Other +Source: %{name}-source-SNAPSHOT-%{timestamp}.tar.bz2 +Source1: %{name}.desktop +# PATCH-FIX-UPSTREAM docdir.patch cwh@suse.de -- install documentation to a LSB conform place +Patch0: docdir.patch +BuildRequires: autoconf BuildRequires: automake BuildRequires: bison BuildRequires: flex @@ -36,6 +41,7 @@ BuildRequires: libesd-devel BuildRequires: libpng-devel BuildRequires: libtool BuildRequires: python-devel +BuildRequires: readline-devel BuildRequires: sqlite3-devel BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-2.0) @@ -48,65 +54,83 @@ BuildRequires: libpng-devel %endif %if 0%{?suse_version} BuildRequires: update-desktop-files -Recommends: gnubg-databases -Recommends: gnubg-sounds +Recommends: gnubg-databases = %{version} +Recommends: gnubg-sounds = %{version} +Recommends: gnubg-doc = %{version} %endif -Patch0: gnubgmodule_bufferoverflow.patch -Patch1: configure.in_libpngversion.patch -Patch2: export.c_libpng14.patch %description -Program for playing and analysing backgammon positions, games and matches. It is based on a neural network. It currently plays at about the level of a championship flight tournament player. Depending on its parameters and its luck in recent games, it rates from around 1900 to 2000 on FIBS, the First Internet Backgammon Server -- at its strongest, it ranks in the top 5 of over 6000 rated players there and is gradually improving. +Program for playing and analysing backgammon positions, games and matches. It is +based on a neural network. It currently plays at about the level of a +championship flight tournament player. Depending on its parameters and its luck +in recent games, it rates from around 1900 to 2000 on FIBS, the First Internet +Backgammon Server -- at its strongest, it ranks in the top 5 of over 6000 rated +players there and is gradually improving. %package databases -Summary: Databases for gnubg +Summary: Bearoff databases for gnubg Group: Amusements/Games/Board/Other -Requires: %{name} +Requires: %{name} = %{version} %description databases -This package contains the GNU Backgammon bearoff databases. +Precalculated GNU Backgammon bearoff databases - its intelligence. If you prefer +a stronger or weaker opponent calculate you own with tweaked parameters +according to the documentation. %package sounds Summary: Sounds for gnubg Group: Amusements/Games/Board/Other -Requires: %{name} +Requires: %{name} = %{version} %description sounds -This package contains the sounds for GNU Backgammon. +Sounds for GNU Backgammon. + +%package doc +Summary: Documentation for gnubg +Group: Amusements/Games/Board/Other + +%description doc +Manual for GNU Backgammon. %prep %setup -q -n gnubg -%patch0 -p1 -%if 0%{?suse_version} > 1120 -%patch1 -%patch2 -%endif +%patch0 -p0 %build autoreconf -fi -export SUSE_ASNEEDED=0 -%configure +#export SUSE_ASNEEDED=0 +%configure --docdir=%{_docdir}/%{name} make %{?_smp_mflags} %install -%makeinstall +%make_install + +DOC="ABOUT-NLS CODING COPYING NEWS README TODO" +#for FILE in $DOC ; do + install -m 0644 $DOC %{buildroot}/%{_docdir}/%{name}/ +#done + %if 0%{?suse_version} -%suse_update_desktop_file -c %{name} "GNU Backgammon" "Backgammon Board Game" "%{name} -w" /usr/share/%{name}/%{name}.png "Game;BoardGame;" +%suse_update_desktop_file -i %{name} %endif %find_lang %{name} %files -f %{name}.lang %defattr(-,root,root) -%doc ABOUT-NLS AUTHORS CODING COPYING NEWS README TODO %{_bindir}/* %{_mandir}/man?/%{name}* -%docdir %{_datadir}/gnubg/doc %if 0%{?suse_version} %{_datadir}/applications/gnubg.desktop %endif +%{_datadir}/icons/hicolor/*/apps/gnubg.png %{_datadir}/gnubg %exclude %{_datadir}/gnubg/*.bd %exclude %{_datadir}/gnubg/sounds +%doc %{_docdir}/%{name} +%exclude %{_docdir}/%{name}/images +%exclude %{_docdir}/%{name}/gnubg.html +%exclude %{_docdir}/%{name}/allabout.html + %files databases %defattr(-,root,root) @@ -116,4 +140,10 @@ make %{?_smp_mflags} %defattr(-,root,root) %{_datadir}/gnubg/sounds +%files doc +%defattr(-,root,root) +%doc %{_docdir}/%{name}/images +%doc %{_docdir}/%{name}/gnubg.html +%doc %{_docdir}/%{name}/allabout.html + %changelog diff --git a/gnubgmodule_bufferoverflow.patch b/gnubgmodule_bufferoverflow.patch deleted file mode 100644 index b3895d2..0000000 --- a/gnubgmodule_bufferoverflow.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- gnubg/gnubgmodule.c.~1.79.~ 2008-02-18 07:20:04.000000000 +0100 -+++ gnubg/gnubgmodule.c 2010-05-19 11:08:26.000000000 +0200 -@@ -881,7 +881,7 @@ - PyObject *pyBoard = NULL; - int nChequers = 15; - int nPoints = 6; -- unsigned int anBoard[ 25 ]; -+ unsigned int anBoard[ 2 ][ 25 ]; - - memcpy( anBoard, msBoard(), sizeof(TanBoard) ); - -@@ -897,7 +897,7 @@ - - static PyObject *PythonPositionFromBearoff( PyObject* self UNUSED_PARAM, PyObject *args ) - { -- unsigned int anBoard[ 25 ]; -+ unsigned int anBoard[ 2 ][ 25 ]; - int iPos = 0; - int nChequers = 15; - int nPoints = 6;