diff --git a/.cvsignore b/.cvsignore index dcd9f46..31cbc96 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fillets-ng-0.7.3.tar.gz +fillets-ng-0.7.4.tar.gz diff --git a/fillets-ng-0.7.3-libX11.patch b/fillets-ng-0.7.3-libX11.patch deleted file mode 100644 index 92ce2c7..0000000 --- a/fillets-ng-0.7.3-libX11.patch +++ /dev/null @@ -1,41 +0,0 @@ -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-08-30 13:50:45.000000000 +0200 -@@ -13,9 +13,6 @@ AC_PROG_CC - AC_PROG_INSTALL - AC_PROG_RANLIB - --CPPFLAGS="-I/usr/local/include $CPPFLAGS" --LIBS="-L/usr/local/lib $LIBS" -- - ################################################### - # Check for libm - AC_CHECK_LIB(m, sin, LIBS="$LIBS -lm") -@@ -89,18 +86,15 @@ AC_CHECK_LIB([SDL_ttf], [TTF_OpenFont], - - ################################################### - # Test X11 --OLD_CPPFLAGS="$CPPFLAGS" --CPPFLAGS="$CPPFLAGS $SDL_CFLAGS" --AC_TRY_COMPILE([ -- #include "SDL.h" -- #include "SDL_syswm.h" -- #include -- ], [ -- SDL_SysWMinfo info; -- info.subsystem = SDL_SYSWM_X11; -- ], [have_x11="yes"], [have_x11="no"]) --CPPFLAGS="$OLD_CPPFLAGS" --if test "x$have_x11" = xyes; then -+AC_PATH_X -+AC_CHECK_LIB(X11, XFree, -+ have_x11='yes', -+ have_x11='no', -+ [-lX11 -L${x_libraries}]) -+AC_CHECK_HEADERS(X11/Xutil.h) -+if test "$have_x11" != 'no'; then -+ CPPFLAGS="$X_CFLAGS $CPPFLAGS" -+ LIBS="$X_LIBS $LIBS -lX11" - AC_DEFINE(HAVE_X11) - fi - diff --git a/fillets-ng-0.7.3-lua-pkgconfig.patch b/fillets-ng-0.7.3-lua-pkgconfig.patch deleted file mode 100644 index 7f87c37..0000000 --- a/fillets-ng-0.7.3-lua-pkgconfig.patch +++ /dev/null @@ -1,46 +0,0 @@ -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 4d468be..ffa50f6 100644 --- a/fillets-ng.spec +++ b/fillets-ng.spec @@ -1,21 +1,17 @@ Summary: Fish Fillets Next Generation, a puzzle game with 70 levels Name: fillets-ng -Version: 0.7.3 -Release: 5%{?dist} +Version: 0.7.4 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://fillets.sourceforge.net/ -Source0: http://dl.sf.net/fillets/fillets-ng-%{version}.tar.gz +Source0: http://downloads.sf.net/fillets/fillets-ng-%{version}.tar.gz Source1: fillets.desktop Source2: fillets.png -Patch0: fillets-ng-0.7.3-lua-pkgconfig.patch -Patch1: fillets-ng-0.7.3-libX11.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: fillets-ng-data >= 0.7.1 +Requires: fillets-ng-data >= 0.7.4 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 @@ -28,28 +24,27 @@ comforting music. %prep %setup -q -%patch0 -p1 -b .lua-pkgconfig -%patch1 -p1 -b .libX11 -autoreconf --install --force %build -%configure +%configure --datadir=%{_datadir}/fillets-ng %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} -%makeinstall +%{__make} install DESTDIR=%{buildroot} # Install desktop file %{__mkdir_p} %{buildroot}%{_datadir}/applications -desktop-file-install --vendor=fedora \ +desktop-file-install \ + --vendor="" \ --dir %{buildroot}%{_datadir}/applications \ %{SOURCE1} # Install themeable icon -%{__install} -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/fillets.png +%{__install} -D -p -m 0644 %{SOURCE2} \ + %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/fillets.png %clean @@ -57,22 +52,32 @@ desktop-file-install --vendor=fedora \ %post -update-desktop-database %{_datadir}/applications &>/dev/null || : +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun -update-desktop-database %{_datadir}/applications &>/dev/null || : +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files -%defattr(-, root, root, 0755) +%defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO %{_bindir}/fillets -%{_datadir}/applications/fedora-fillets.desktop -%{_datadir}/pixmaps/fillets.png +%{_datadir}/applications/fillets.desktop +%{_datadir}/icons/hicolor/32x32/apps/fillets.png %{_mandir}/man6/fillets.6* %changelog +* Wed Jun 20 2007 Matthias Saou 0.7.4-1 +- Update to 0.7.4. +- Switch to using downloads.sf.net source URL. +- Switch to using the DESTDIR install method. +- Remove the fedora desktop file prefix. +- Remove all patches, no longer required, don't autoreconf anymore either. +- Force datadir to be the new location of our fillets-ng-data package's files. + * Mon Aug 28 2006 Matthias Saou 0.7.3-5 - FC6 rebuild. - Add libX11 patch, link against X11 even when SDL isn't (#204594, #204600). diff --git a/fillets.desktop b/fillets.desktop index dc6a354..60a2164 100644 --- a/fillets.desktop +++ b/fillets.desktop @@ -6,8 +6,8 @@ Comment=Puzzle game with 70 levels Comment[fr]=Jeu de réflexion avec 70 niveaux Comment[es]=Juego de mente con 70 niveles Exec=fillets -Icon=fillets.png +Icon=fillets Terminal=false Type=Application -Categories=Application;Game; +Categories=Game; Encoding=UTF-8 diff --git a/sources b/sources index 7f6570b..ed78f2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3cdb20616c8bf4498f2990f4e0d526a1 fillets-ng-0.7.3.tar.gz +912c146e70d90092a3dc89928e0be0f8 fillets-ng-0.7.4.tar.gz