diff --git a/fillets-ng-0.8.1.patch b/fillets-ng-0.8.1.patch deleted file mode 100644 index 0125b06..0000000 --- a/fillets-ng-0.8.1.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- 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.9.3-datadir.patch b/fillets-ng-0.9.3-datadir.patch new file mode 100644 index 0000000..6ae0ca0 --- /dev/null +++ b/fillets-ng-0.9.3-datadir.patch @@ -0,0 +1,13 @@ +Index: src/gengine/Makefile.in +=================================================================== +--- src/gengine/Makefile.in.orig ++++ src/gengine/Makefile.in +@@ -226,7 +226,7 @@ target_cpu = @target_cpu@ + 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=\""$(pkgdatadir)"\" + @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.changes b/fillets-ng.changes index ce324f1..8b55d96 100644 --- a/fillets-ng.changes +++ b/fillets-ng.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat May 1 18:49:15 UTC 2010 - cmorve69@yahoo.es + +- Set the correct datadir so it works again with fillets-ng-data + ------------------------------------------------------------------- Fri Mar 12 13:58:12 UTC 2010 - dimstar@opensuse.org diff --git a/fillets-ng.desktop b/fillets-ng.desktop index cf79c6d..75e7c09 100644 --- a/fillets-ng.desktop +++ b/fillets-ng.desktop @@ -3,3 +3,4 @@ Type=Application Name=Fish Filets NG Exec=fillets Icon=fillets-ng +Categories=Game;LogicGame; diff --git a/fillets-ng.spec b/fillets-ng.spec index 034584a..0d94b47 100644 --- a/fillets-ng.spec +++ b/fillets-ng.spec @@ -19,7 +19,7 @@ Name: fillets-ng Version: 0.9.3 -Release: 1 +Release: 6 License: GNU General Public License (GPL) - all versions Summary: Fish Fillets - Next Generation Url: http://fillets.sourceforge.net/ @@ -27,8 +27,8 @@ Group: Amusements/Games/Action/Arcade Source0: %{name}-%{version}.tar.bz2 Source1: %{name}.desktop Source2: %{name}.png -# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches -Patch0: %{name}-0.8.1.patch +Patch0: %{name}-%{version}-datadir.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel BuildRequires: SDL_ttf-devel @@ -39,7 +39,6 @@ BuildRequires: pkgconfig BuildRequires: update-desktop-files # There is no 0.9.3 data package, as this was a minor build fix only. Requires: %{name}-data = 0.9.2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Fish Fillets is strictly a puzzle game. The goal in each of the 70 @@ -53,13 +52,13 @@ your fish. The whole game is accompanied by quiet, comforting music. %patch0 %build -%configure --bindir=%{_prefix}/games -make %{?jobs:-j%jobs} +%configure +make %{?jobs:-j %jobs} %install -%makeinstall -install -D -m 0644 %{S:2} %{buildroot}%{_datadir}/pixmaps/%{name}.png -%suse_update_desktop_file -i %{name} Game ArcadeGame +make DESTDIR=%{buildroot} install +install -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png +%suse_update_desktop_file -i %{name} %clean rm -rf %{buildroot} @@ -68,7 +67,7 @@ rm -rf %{buildroot} %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README TODO %doc %{_mandir}/man6/* -%{_prefix}/games/fillets +%{_bindir}/fillets %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png