diff --git a/fillets-ng-0.7.3-lua-pkgconfig.patch b/fillets-ng-0.7.3-lua-pkgconfig.patch new file mode 100644 index 0000000..7f87c37 --- /dev/null +++ b/fillets-ng-0.7.3-lua-pkgconfig.patch @@ -0,0 +1,46 @@ +diff -Naupr fillets-ng-0.7.3.orig/configure.in fillets-ng-0.7.3/configure.in +--- fillets-ng-0.7.3.orig/configure.in 2005-10-04 20:11:00.000000000 +0200 ++++ fillets-ng-0.7.3/configure.in 2006-05-31 17:49:58.000000000 +0200 +@@ -22,41 +22,9 @@ AC_CHECK_LIB(m, sin, LIBS="$LIBS -lm") + + ################################################### + # Check for lua and define LUA_CFLAGS and LUA_LIBS +- +-dnl ---- lua check ------------- (stolen from Stratagus) +-AC_ARG_WITH(lua, [ --with-lua=PFX Prefix where Lua is installed], +- LUAPFX="$withval", LUAPFX="") +-if test "x$LUAPFX" != x ; then +- LUA_CFLAGS="-I$LUAPFX" +- LUA_LIBS="-L$LUAPFX -llua -llualib" +-else +-dnl Debian, and possibly other systems, include this script... +- AC_CHECK_PROGS(LUACONFIG, [lua-config lua-config50 lua-config5.0], "") +- if test "x$LUACONFIG" != x; then +- LUA_CFLAGS="`[$LUACONFIG --include]`" +- LUA_LIBS="`[$LUACONFIG --static]`" +- else dnl ...otherwise, attempt to guess +- LUA_CFLAGS="" +- LUA_LIBS="" +- 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", +- [AC_MSG_ERROR([*** Lua5 is required. +- Try --with-lua=PREFIX +- You can download lua from http://www.lua.org])], +- $LUA_LIBS)], $LUA_LIBS)], $LUA_LIBS) +- +- AC_CHECK_LIB(lualib, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib", +- [AC_CHECK_LIB(lualib50, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib50", +- [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 ++PKG_CHECK_MODULES(LUA, lua, [have_lua="yes"], [have_lua="no"]) + AC_SUBST(LUA_CFLAGS) + AC_SUBST(LUA_LIBS) +-dnl ---- end of lua check ------ + + + ################################################### diff --git a/fillets-ng.spec b/fillets-ng.spec index 312ec87..f8a92cb 100644 --- a/fillets-ng.spec +++ b/fillets-ng.spec @@ -1,17 +1,20 @@ Summary: Fish Fillets Next Generation, a puzzle game with 70 levels Name: fillets-ng Version: 0.7.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Amusements/Games URL: http://fillets.sourceforge.net/ Source0: http://dl.sf.net/fillets/fillets-ng-%{version}.tar.gz Source1: fillets.desktop Source2: fillets.png +Patch0: fillets-ng-0.7.3-lua-pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: fillets-ng-data >= 0.7.1 BuildRequires: SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_ttf-devel BuildRequires: lua-devel, fribidi-devel, desktop-file-utils +# Required for autoreconf +BuildRequires: autoconf, automake, libtool %description Fish Fillets is strictly a puzzle game. The goal in every of the @@ -24,6 +27,8 @@ comforting music. %prep %setup -q +%patch0 -p1 -b .lua-pkgconfig +autoreconf --install --force %build @@ -66,6 +71,10 @@ update-desktop-database %{_datadir}/applications &>/dev/null || : %changelog +* Wed May 31 2006 Matthias Saou 0.7.3-4 +- Add patch to change lua detection from lua-config to pkgconfig since the + latest lua packages no longer provide the config script. + * Mon Mar 6 2006 Matthias Saou 0.7.3-3 - FC5 rebuild.