rpms/fillets-ng/devel .cvsignore, 1.4, 1.5 fillets-ng.spec, 1.9, 1.10 fillets.desktop, 1.1, 1.2 sources, 1.4, 1.5 fillets-ng-0.7.3-libX11.patch, 1.1, NONE fillets-ng-0.7.3-lua-pkgconfig.patch, 1.1, NONE

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/fillets-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13460

Modified Files:
	.cvsignore fillets-ng.spec fillets.desktop sources 
Removed Files:
	fillets-ng-0.7.3-libX11.patch 
	fillets-ng-0.7.3-lua-pkgconfig.patch 
Log Message:
Update to 0.7.4 with moderate cleanups.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Oct 2005 23:35:15 -0000	1.4
+++ .cvsignore	20 Jun 2007 11:39:42 -0000	1.5
@@ -1 +1 @@
-fillets-ng-0.7.3.tar.gz
+fillets-ng-0.7.4.tar.gz


Index: fillets-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng/devel/fillets-ng.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fillets-ng.spec	30 Aug 2006 11:55:23 -0000	1.9
+++ fillets-ng.spec	20 Jun 2007 11:39:42 -0000	1.10
@@ -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 @@
 
 %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 @@
 
 
 %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 <http://freshrpms.net/> 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 <http://freshrpms.net/> 0.7.3-5
 - FC6 rebuild.
 - Add libX11 patch, link against X11 even when SDL isn't (#204594, #204600).


Index: fillets.desktop
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng/devel/fillets.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fillets.desktop	1 Feb 2005 14:05:13 -0000	1.1
+++ fillets.desktop	20 Jun 2007 11:39:42 -0000	1.2
@@ -6,8 +6,8 @@
 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Oct 2005 23:35:15 -0000	1.4
+++ sources	20 Jun 2007 11:39:42 -0000	1.5
@@ -1 +1 @@
-3cdb20616c8bf4498f2990f4e0d526a1  fillets-ng-0.7.3.tar.gz
+912c146e70d90092a3dc89928e0be0f8  fillets-ng-0.7.4.tar.gz


--- fillets-ng-0.7.3-libX11.patch DELETED ---


--- fillets-ng-0.7.3-lua-pkgconfig.patch DELETED ---