rpms/tuxpuck/FC-5 tuxpuck.desktop,1.1,1.2 tuxpuck.spec,1.1,1.2

Jon Ciesla (limb) fedora-extras-commits at redhat.com
Fri Mar 30 12:16:59 UTC 2007


Author: limb

Update of /cvs/extras/rpms/tuxpuck/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2558

Modified Files:
	tuxpuck.desktop tuxpuck.spec 
Log Message:
Cleanup fixes.



Index: tuxpuck.desktop
===================================================================
RCS file: /cvs/extras/rpms/tuxpuck/FC-5/tuxpuck.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tuxpuck.desktop	7 Aug 2006 10:46:46 -0000	1.1
+++ tuxpuck.desktop	30 Mar 2007 12:16:26 -0000	1.2
@@ -8,4 +8,4 @@
 Terminal=false
 Type=Application
 Icon=tuxpuck.png
-Categories=Application;Game;ArcadeGame;
+Categories=Game;ArcadeGame;SportsGame;


Index: tuxpuck.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxpuck/FC-5/tuxpuck.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tuxpuck.spec	7 Aug 2006 10:46:46 -0000	1.1
+++ tuxpuck.spec	30 Mar 2007 12:16:26 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           tuxpuck
 Version:        0.8.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        3D Shufflepuck Pong Game
 
 Group:          Amusements/Games
@@ -8,20 +8,21 @@
 URL:            http://www.efd.lth.se/~d00jkr/tuxpuck/
 Source0:        http://www.efd.lth.se/~d00jkr/tuxpuck/%{name}-%{version}.tar.gz
 Source1:        tuxpuck.desktop
-Source2:        tuxpuck.png
 Patch0:         tuxpuck-0.8.2-mandest.patch
 Patch1:         tuxpuck-0.8.2-utils-werror.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel, freetype-devel, libvorbis-devel
 BuildRequires:  libpng-devel, libjpeg-devel, desktop-file-utils
+BuildRequires:	ImageMagick
+
+Requires: hicolor-icon-theme
 
 %description
 TuxPuck is a shufflepuck game written in C using SDL. The player moves a pad
 around a board and tries to shoot down the puck through the opponents defense.
 Easy to play, difficult to win.
 
-
 %prep
 %setup -q
 %patch0 -p0 -z .mandest
@@ -30,38 +31,30 @@
 %build
 export CFLAGS="%{optflags}"
 make
-
+convert -transparent white data/icons/%{name}.ico %{name}.png
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # Install icon and desktop file
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
+install %{name}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
 
 desktop-file-install --vendor fedora                            \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications           \
-        --add-category X-Fedora                                 \
         %{SOURCE1}
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %files
 %defattr(-,root,root,-)
@@ -69,10 +62,15 @@
 %{_bindir}/%{name}
 %{_mandir}/man6/%{name}.6.gz
 %{_datadir}/applications/fedora-tuxpuck.desktop
-%{_datadir}/icons/hicolor/48x48/apps/tuxpuck.png
-
+%{_datadir}/icons/hicolor/32x32/apps/tuxpuck.png
 
 %changelog
+* Fri Mar 30 2007 Jon Ciesla <limb at jcomserv.net> 0.8.2-3
+- Applied cleanup fixes from Hans de Goede's BZ 234566/234307
+
+* Wed Sep 13 2006 Hugo Cisneiros <hugo at devin.com.br> 0.8.2-2
+- Rebuilt for FC6
+
 * Thu Aug  3 2006 Hugo Cisneiros <hugo at devin.com.br> 0.8.2-1
 - Initial RPM provided by Che
 - Extras Release




More information about the fedora-extras-commits mailing list