From 3ce81e18c2d2d8b0e9c9e80d9889d153abeb83df39e6545077f8260f149c9bba Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sun, 25 Feb 2007 22:23:54 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fillets-ng?expand=0&rev=2 --- fillets-ng-0.7.3.diff | 11 ----------- fillets-ng-0.7.3.tar.bz2 | 3 --- fillets-ng-0.7.4.diff | 21 +++++++++++++++++++++ fillets-ng-0.7.4.tar.bz2 | 3 +++ fillets-ng-lua.diff | 20 -------------------- fillets-ng.changes | 8 ++++++++ fillets-ng.spec | 23 +++++++++++++---------- 7 files changed, 45 insertions(+), 44 deletions(-) delete mode 100644 fillets-ng-0.7.3.diff delete mode 100644 fillets-ng-0.7.3.tar.bz2 create mode 100644 fillets-ng-0.7.4.diff create mode 100644 fillets-ng-0.7.4.tar.bz2 delete mode 100644 fillets-ng-lua.diff diff --git a/fillets-ng-0.7.3.diff b/fillets-ng-0.7.3.diff deleted file mode 100644 index ef02551..0000000 --- a/fillets-ng-0.7.3.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in -+++ configure.in -@@ -37,7 +37,7 @@ - LUA_LIBS="`[$LUACONFIG --libs]`" - else dnl ...otherwise, attempt to guess - LUA_CFLAGS="" -- LUA_LIBS="" -+ LUA_LIBS="-ldl" - AC_CHECK_LIB(lua, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua", - [AC_CHECK_LIB(lua50, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua50", - [AC_CHECK_LIB(lua5.0, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua5.0", diff --git a/fillets-ng-0.7.3.tar.bz2 b/fillets-ng-0.7.3.tar.bz2 deleted file mode 100644 index af104f6..0000000 --- a/fillets-ng-0.7.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f887922d23eeca0a6c77dbbe1a4690b7e2ef3d915d74459cbe1e2e3f529fad0 -size 232773 diff --git a/fillets-ng-0.7.4.diff b/fillets-ng-0.7.4.diff new file mode 100644 index 0000000..0125b06 --- /dev/null +++ b/fillets-ng-0.7.4.diff @@ -0,0 +1,21 @@ +--- src/gengine/Makefile.am ++++ src/gengine/Makefile.am +@@ -1,6 +1,6 @@ + + INCLUDES = $(SDL_CFLAGS) $(LUA_CFLAGS) $(BOOST_CFLAGS) +-AM_CPPFLAGS = -DSYSTEM_DATA_DIR=\""@datadir@"\" ++AM_CPPFLAGS = -DSYSTEM_DATA_DIR=\""$(datadir)/games/@PACKAGE@"\" + + if WITH_BOOST + FSPATH_IMPL = FsPath_boost.cpp +--- src/gengine/Makefile.in ++++ src/gengine/Makefile.in +@@ -226,7 +226,7 @@ + target_os = @target_os@ + target_vendor = @target_vendor@ + INCLUDES = $(SDL_CFLAGS) $(LUA_CFLAGS) $(BOOST_CFLAGS) +-AM_CPPFLAGS = -DSYSTEM_DATA_DIR=\""@datadir@"\" ++AM_CPPFLAGS = -DSYSTEM_DATA_DIR=\""$(datadir)/games/@PACKAGE@"\" + @WITH_BOOST_FALSE@FSPATH_IMPL = FsPath.cpp + @WITH_BOOST_TRUE@FSPATH_IMPL = FsPath_boost.cpp + EXTRA_DIST = FsPath.cpp FsPath_boost.cpp diff --git a/fillets-ng-0.7.4.tar.bz2 b/fillets-ng-0.7.4.tar.bz2 new file mode 100644 index 0000000..dfbe2ed --- /dev/null +++ b/fillets-ng-0.7.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:beabeb089cee7353e8c8b7691f1b6aa3f64976586894498147bbb9b381b5827c +size 250938 diff --git a/fillets-ng-lua.diff b/fillets-ng-lua.diff deleted file mode 100644 index 5cfeeb9..0000000 --- a/fillets-ng-lua.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.in -+++ configure.in -@@ -36,6 +36,8 @@ - LUA_CFLAGS="`[$LUACONFIG --include]`" - LUA_LIBS="`[$LUACONFIG --static]`" - else dnl ...otherwise, attempt to guess -+ PKG_CHECK_MODULES(LUA,lua >= 5.1,LUA_FOUND=yes,LUA_FOUND=no) -+ if test "$LUA_FOUND" = no ; then - LUA_CFLAGS="" - LUA_LIBS="-ldl" - AC_CHECK_LIB(lua, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua", -@@ -51,7 +53,8 @@ - [AC_CHECK_LIB(lualib5.0, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib5.0", - [AC_MSG_ERROR([*** Lualib5 is required. - You can download lua from http://www.lua.org])], - $LUA_LIBS)], $LUA_LIBS)], $LUA_LIBS) -+ fi - fi - fi - AC_SUBST(LUA_CFLAGS) diff --git a/fillets-ng.changes b/fillets-ng.changes index f09109f..8fe3050 100644 --- a/fillets-ng.changes +++ b/fillets-ng.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Feb 19 13:56:08 CET 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 01:39:02 CEST 2006 - ro@suse.de diff --git a/fillets-ng.spec b/fillets-ng.spec index d8caa8f..22b798f 100644 --- a/fillets-ng.spec +++ b/fillets-ng.spec @@ -1,7 +1,7 @@ # -# spec file for package fillets-ng (Version 0.7.3) +# spec file for package fillets-ng (Version 0.7.4) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 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. # @@ -12,19 +12,18 @@ Name: fillets-ng BuildRequires: SDL_image-devel SDL_mixer-devel SDL_ttf fribidi-devel gcc-c++ lua-devel pkgconfig update-desktop-files -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: Amusements/Games/Action/Arcade Summary: Fish Fillets--Next Generation -Version: 0.7.3 -Release: 27 +Version: 0.7.4 +Release: 1 URL: http://fillets.sourceforge.net Source0: %{name}-%{version}.tar.bz2 Source1: %name.desktop Source2: %name.png -Patch: fillets-ng-%{version}.diff -Patch1: fillets-ng-lua.diff +Patch: %{name}-%{version}.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: fillets-ng-data >= 0.7.1 +Requires: fillets-ng-data >= 0.7.4 %description Fish Fillets is strictly a puzzle game. The goal in each of the 70 @@ -45,7 +44,6 @@ Authors: %prep %setup -q %patch -%patch1 %build %{suse_update_config} @@ -81,7 +79,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/%name.desktop %{_datadir}/pixmaps/%name.png -%changelog -n fillets-ng +%changelog +* 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 - fix build with current lua * Tue Aug 15 2006 - anicka@suse.cz