From 621a5ee19afabca5da7a840e9b3a3870b4d1767092a0317bb7e752d864e3ef29 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 30 Jan 2008 17:06:58 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fillets-ng?expand=0&rev=5 --- fillets-ng-0.7.4-gcc4.3.diff | 30 ------------ fillets-ng-0.7.4.tar.bz2 | 3 -- fillets-ng-0.8.0-undeclared.patch | 37 ++++++++++++++ fillets-ng-0.8.0.tar.bz2 | 3 ++ fillets-ng.changes | 11 +++++ fillets-ng.spec | 80 +++++++++++++++++-------------- 6 files changed, 95 insertions(+), 69 deletions(-) delete mode 100644 fillets-ng-0.7.4-gcc4.3.diff delete mode 100644 fillets-ng-0.7.4.tar.bz2 create mode 100644 fillets-ng-0.8.0-undeclared.patch create mode 100644 fillets-ng-0.8.0.tar.bz2 diff --git a/fillets-ng-0.7.4-gcc4.3.diff b/fillets-ng-0.7.4-gcc4.3.diff deleted file mode 100644 index 9db2c36..0000000 --- a/fillets-ng-0.7.4-gcc4.3.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- src/gengine/OptionAgent.cpp -+++ src/gengine/OptionAgent.cpp -@@ -25,6 +25,7 @@ - - #include //strlen - #include //setlocale -+#include //getenv - - #ifndef LC_MESSAGES - #define LC_MESSAGES LC_CTYPE ---- src/gengine/StringTool.cpp -+++ src/gengine/StringTool.cpp -@@ -9,6 +9,7 @@ - #include "StringTool.h" - - #include -+#include - - //----------------------------------------------------------------- - /** ---- src/level/Landslip.cpp -+++ src/level/Landslip.cpp -@@ -10,6 +10,7 @@ - - #include "Rules.h" - #include "minmax.h" -+#include - - //----------------------------------------------------------------- - Landslip::Landslip(const ModelList &models) diff --git a/fillets-ng-0.7.4.tar.bz2 b/fillets-ng-0.7.4.tar.bz2 deleted file mode 100644 index dfbe2ed..0000000 --- a/fillets-ng-0.7.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:beabeb089cee7353e8c8b7691f1b6aa3f64976586894498147bbb9b381b5827c -size 250938 diff --git a/fillets-ng-0.8.0-undeclared.patch b/fillets-ng-0.8.0-undeclared.patch new file mode 100644 index 0000000..3b68938 --- /dev/null +++ b/fillets-ng-0.8.0-undeclared.patch @@ -0,0 +1,37 @@ +Index: src/gengine/OptionAgent.cpp +=================================================================== +--- src/gengine/OptionAgent.cpp.orig ++++ src/gengine/OptionAgent.cpp +@@ -25,6 +25,7 @@ + + #include //strlen + #include //setlocale ++#include //getenv + + #ifndef LC_MESSAGES + #define LC_MESSAGES LC_CTYPE +Index: src/gengine/StringTool.cpp +=================================================================== +--- src/gengine/StringTool.cpp.orig ++++ src/gengine/StringTool.cpp +@@ -7,7 +7,7 @@ + * (at your option) any later version. + */ + #include "StringTool.h" +- ++#include + #include + + //----------------------------------------------------------------- +Index: src/level/Landslip.cpp +=================================================================== +--- src/level/Landslip.cpp.orig ++++ src/level/Landslip.cpp +@@ -6,6 +6,7 @@ + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ ++#include + #include "Landslip.h" + + #include "Rules.h" diff --git a/fillets-ng-0.8.0.tar.bz2 b/fillets-ng-0.8.0.tar.bz2 new file mode 100644 index 0000000..ef44494 --- /dev/null +++ b/fillets-ng-0.8.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a456af59687b5af6df5036a53c6698d904899567116882b17272ea9be19f359 +size 253125 diff --git a/fillets-ng.changes b/fillets-ng.changes index 7b365aa..1853e14 100644 --- a/fillets-ng.changes +++ b/fillets-ng.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Jan 29 20:01:50 CET 2008 - lrupp@suse.de + +- update to 0.8.0: + + Undo (on key '-') + + Five extra levels (by Mirek Olsak) + + Slovenian translation (by Marko Burjek) + + Brazilian Portuguese translation (by Ricardo Faria) + + Russian translation + (by Leonid Myravjev, Maria Antropova, Gregory Bonik) + ------------------------------------------------------------------- Thu Oct 25 18:14:35 CEST 2007 - anicka@suse.cz diff --git a/fillets-ng.spec b/fillets-ng.spec index e677bce..f5ba614 100644 --- a/fillets-ng.spec +++ b/fillets-ng.spec @@ -1,7 +1,7 @@ # -# spec file for package fillets-ng (Version 0.7.4) +# spec file for package fillets-ng (Version 0.8.0) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,20 +11,25 @@ # norootforbuild Name: fillets-ng -BuildRequires: SDL_image-devel SDL_mixer-devel SDL_ttf-devel fribidi-devel gcc-c++ lua-devel pkgconfig update-desktop-files +BuildRequires: SDL_image-devel SDL_mixer-devel fribidi-devel gcc-c++ lua-devel pkgconfig update-desktop-files +%if 0%{?suse_version} >= 1020 +BuildRequires: SDL_ttf-devel +%else +BuildRequires: SDL_ttf +%endif License: GPL v2 or later Group: Amusements/Games/Action/Arcade Summary: Fish Fillets--Next Generation -Version: 0.7.4 -Release: 72 +Version: 0.8.0 +Release: 1 Url: http://fillets.sourceforge.net Source0: %{name}-%{version}.tar.bz2 Source1: %name.desktop Source2: %name.png -Patch: %{name}-%{version}.diff -Patch1: %{name}-%{version}-gcc4.3.diff +Patch: %name-0.7.4.diff +Patch1: fillets-ng-0.8.0-undeclared.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: fillets-ng-data >= 0.7.4 +Requires: fillets-ng-data = %version %description Fish Fillets is strictly a puzzle game. The goal in each of the 70 @@ -53,19 +58,13 @@ aclocal --force libtoolize --force autoconf --force automake -afc -CXXFLAGS="$RPM_OPT_FLAGS" \ -CPPFLAGS="$RPM_OPT_FLAGS" \ -LDFLAGS="-ldl" \ -./configure --prefix=%{_prefix} \ - --bindir=%{_prefix}/games \ - --datadir=%{_datadir} \ - --mandir=%{_mandir} -make +%configure --bindir=%{_prefix}/games +make %{?jobs:-j%jobs} %install -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps -install -m 0644 %{S:2} $RPM_BUILD_ROOT/usr/share/pixmaps/fillets-ng.png +install -m644 %{S:2} $RPM_BUILD_ROOT/usr/share/pixmaps/fillets-ng.png %suse_update_desktop_file -i %name Game ArcadeGame %clean @@ -80,47 +79,56 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/games/fillets %{_datadir}/applications/%name.desktop %{_datadir}/pixmaps/%name.png + %changelog -* Thu Oct 25 2007 - anicka@suse.cz +* Tue Jan 29 2008 lrupp@suse.de +- update to 0.8.0: + + Undo (on key '-') + + Five extra levels (by Mirek Olsak) + + Slovenian translation (by Marko Burjek) + + Brazilian Portuguese translation (by Ricardo Faria) + + Russian translation + (by Leonid Myravjev, Maria Antropova, Gregory Bonik) +* Thu Oct 25 2007 anicka@suse.cz - fix for gcc 4.3 -* Tue Jul 03 2007 - anicka@suse.cz +* Tue Jul 03 2007 anicka@suse.cz - fix dependency on SDL_ttf-devel -* Mon Feb 19 2007 - anicka@suse.cz +* Mon Feb 19 2007 anicka@suse.cz - update to 0.7.4 * fixes for new version of lua - update fixes #246724 - remove last patch (fixed in upstream) -* Fri Oct 20 2006 - ro@suse.de +* Fri Oct 20 2006 ro@suse.de - fix build with current lua -* Tue Aug 15 2006 - anicka@suse.cz +* Tue Aug 15 2006 anicka@suse.cz - add desktop file and icon (#198287) -* Thu Mar 16 2006 - anicka@suse.cz +* Thu Mar 16 2006 anicka@suse.cz - fix dependencies (#158267) -* Mon Jan 30 2006 - ro@suse.de +* Mon Jan 30 2006 ro@suse.de - added gcc-c++ to BuildRequires -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Thu Jan 05 2006 - anicka@suse.cz +* Thu Jan 05 2006 anicka@suse.cz - update to 0.7.3 - require fribidi - add -ldl to LDFLAGS -* Fri Sep 09 2005 - ro@suse.de +* Fri Sep 09 2005 ro@suse.de - fix configure to find liblua -* Wed Jul 20 2005 - anicka@suse.cz +* Wed Jul 20 2005 anicka@suse.cz - update to 0.7.1 -* Mon Jun 20 2005 - anicka@suse.cz +* Mon Jun 20 2005 anicka@suse.cz - update to 0.7.0 -* Wed Oct 13 2004 - mcihar@suse.cz +* Wed Oct 13 2004 mcihar@suse.cz - update to 0.6.0 - versioned dependancy on fillets-ng-data -* Thu Aug 12 2004 - mcihar@suse.cz +* Thu Aug 12 2004 mcihar@suse.cz - version 0.5.0 doesn't require boost -* Thu Aug 12 2004 - mcihar@suse.cz +* Thu Aug 12 2004 mcihar@suse.cz - update to 0.5.0 - split data to noarch package -* Wed Aug 04 2004 - mcihar@suse.cz +* Wed Aug 04 2004 mcihar@suse.cz - update to 0.4.1 -* Mon May 10 2004 - mcihar@suse.cz +* Mon May 10 2004 mcihar@suse.cz - updated to 0.3.0:    * game world map    * save/load (F2/F3) @@ -128,5 +136,5 @@ rm -rf $RPM_BUILD_ROOT    * two animated videos    * optional controls with spacebar and arrow keys    * How to Play manual -* Fri Apr 23 2004 - mcihar@suse.cz +* Fri Apr 23 2004 mcihar@suse.cz - initial packaging