rpms/monsterz/F-8 monsterz.spec, 1.3, 1.4 sources, 1.2, 1.3 monsterz-0.7.0-userpmopts.patch, 1.1, NONE monsterz.desktop, 1.1, NONE monsterz.png, 1.1, NONE

Sun Jan 6 20:47:19 UTC 2008

Author: oddsocks

Update of /cvs/pkgs/rpms/monsterz/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21820

Modified Files:
	monsterz.spec sources 
Removed Files:
	monsterz-0.7.0-userpmopts.patch monsterz.desktop monsterz.png 
Log Message:



Index: monsterz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monsterz/F-8/monsterz.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- monsterz.spec	22 Aug 2007 19:00:40 -0000	1.3
+++ monsterz.spec	6 Jan 2008 20:46:41 -0000	1.4
@@ -1,20 +1,19 @@
 Name:           monsterz
-Version:        0.7.0
-Release:        8%{?dist}
+Version:        0.7.1
+Release:        1%{?dist}
 Summary:        Puzzle game, similar to Bejeweled or Zookeeper
 Group:          Amusements/Games
 License:        WTFPL
-URL:            http://sam.zoy.org/%{name}/
+URL:            http://sam.zoy.org/monsterz/
 Source0:        http://sam.zoy.org/%{name}/%{name}-%{version}.tar.gz
-Source1:        monsterz.png
-Source2:        monsterz.desktop
-Source3:        monsterz.score
-Patch0:         monsterz-0.7.0-userpmopts.patch
+Source1:        %{name}.score
+Patch0:         monsterz-0.7.1-userpmopts.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
-Requires:       monsterz-data
 Requires:       pygame
 Requires:       hicolor-icon-theme
+Provides:       %{name}-data = %{version}-%{release}
+Obsoletes:      %{name}-data < 0.7.1
 
 %description
 Monsterz is a little arcade puzzle game, similar to the famous Bejeweled or
@@ -25,14 +24,6 @@
 board again. Chain reactions earn you even more points.
 
 
-%package data
-Summary:        Data files for the game monsterz
-Group:          Amusements/Games
-
-%description data
-Data files for the game monsterz
-
-
 %prep
 %setup -q
 %patch0 -p1
@@ -41,29 +32,41 @@
 %build
 make %{?_smp_mflags} prefix=%{_usr} datadir=%{_datadir} pkgdatadir=%{_datadir}/%{name} CFLAGS="%{optflags}"
 
+# Build desktop icon
+cat >%{name}.desktop <<EOF
+[Desktop Entry]
+Encoding=UTF-8
+Name=Monsterz
+GenericName=Monsterz Puzzle Game
+Comment=%{summary}
+Exec=%{name}
+Icon=%{name}
+Terminal=false
+Type=Application
+Categories=Game;StrategyGame;
+EOF
+
 
 %install
 rm -rf %{buildroot}
-#Bypass make install as it requires root priviledges and the SRPM
-#may not necessarily be built as root
+# Bypass make install as it requires root priviledges and the SRPM
+# may not necessarily be built as root
 mkdir -p %{buildroot}%{_bindir}
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/64x64/apps
-mkdir -p %{buildroot}%{_datadir}/applications
-mkdir -p %{buildroot}%{_datadir}/%{name}/graphics
-mkdir -p %{buildroot}%{_datadir}/%{name}/sound
+mkdir -p %{buildroot}%{_datadir}/{applications,icons/hicolor/64x64/apps}
+mkdir -p %{buildroot}%{_datadir}/%{name}/{graphics,sound}
 mkdir -p %{buildroot}%{_var}/games
 install -pm0755 %{name} %{buildroot}%{_bindir}
 install -pm0755 %{name}.py %{buildroot}%{_datadir}/%{name}
-cp -a graphics/*.png %{buildroot}%{_datadir}/%{name}/graphics
+cp -a graphics/* %{buildroot}%{_datadir}/%{name}/graphics
 cp -a sound/* %{buildroot}%{_datadir}/%{name}/sound
 
-install -pm0664 %{SOURCE3} %{buildroot}%{_var}/games/%{name}
+install -pm0664 %{SOURCE1} %{buildroot}%{_var}/games/%{name}
 
 desktop-file-install --vendor fedora \
                      --dir %{buildroot}%{_datadir}/applications \
-                     %{SOURCE2}
+                     %{name}.desktop
 
-install -pm0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+install -pm0644 graphics/icon.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
 
 %clean
@@ -88,43 +91,47 @@
 %defattr(-,root,root,-)
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+%{_datadir}/%{name}
 %attr(2755,root,games) %{_bindir}/%{name}
 %attr(-,root,games) %config(noreplace) %{_var}/games/%{name}
 %doc AUTHORS COPYING README TODO
 
 
-%files data
-%defattr(-,root,root,-)
-%{_datadir}/%{name}
-
-
 %changelog
-* Wed Aug 22 2007 Ian Chapman <packages at amiga-hardware.com> 0.7.0-8
+* Sun Jan 06 2008 Ian Chapman <packages[AT]amiga-hardware.com> 0.7.1-1
+- Upgrade to 0.7.1
+- Drop separate data package as it's unnecessary
+- Merge .desktop back into SPEC
+- Various spec cleanups
+- Updated the "use rpm opts" patch
+- Use the icon now supplied
+
+* Wed Aug 22 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.7.0-8
 - Release bump for F8 mass rebuild
 
-* Mon Aug 28 2006 Ian Chapman <packages at amiga-hardware.com> 0.7.0-7
+* Mon Aug 28 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.7.0-7
 - Release bump for FC6 mass rebuild
 
-* Tue Jul 25 2006 Ian Chapman <packages at amiga-hardware.com> 0.7.0-6
+* Tue Jul 25 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.7.0-6
 - Split data into a separate package.
 
-* Sun Jul 23 2006 Ian Chapman <packages at amiga-hardware.com> 0.7.0-5
+* Sun Jul 23 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.7.0-5
 - Moved .desktop external to spec
 - Moved score file external to spec
 - License changed to WTFPL
 - Use %%{_datadir}/%%{name} not %%{_datadir}/games/%%{name}
 
-* Sun Jul 09 2006 Ian Chapman <packages at amiga-hardware.com> 0.7.0-4
+* Sun Jul 09 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.7.0-4
 - Moved icon installation to make it freedesktop compliant
 - Added %%post and %%postun sections to update icon cache at installation
 - Move hiscore table and .desktop generation to %%build
 
-* Sat Jun 24 2006 Ian Chapman <packages at amiga-hardware.com> 0.7.0-3
+* Sat Jun 24 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.7.0-3
 - Cosmetic fixes for the Dribble repository
 
-* Mon May 29 2006 Ian Chapman <packages at amiga-hardware.com> 0.7.0-2
+* Mon May 29 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.7.0-2
 - Replace %%{__rm} in clean section with rm
 - Added patch to compile using rpmoptflags
 
-* Mon May 22 2006 Ian Chapman <packages at amiga-hardware.com> 0.7.0-1.iss
+* Mon May 22 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.7.0-1.iss
 - Initial Release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monsterz/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jul 2006 21:31:02 -0000	1.2
+++ sources	6 Jan 2008 20:46:41 -0000	1.3
@@ -1 +1 @@
-323d04d4a2a2905df91eab4ff17e537d  monsterz-0.7.0.tar.gz
+c2bdb68dcd636df1abd130ac86defd11  monsterz-0.7.1.tar.gz


--- monsterz-0.7.0-userpmopts.patch DELETED ---


--- monsterz.desktop DELETED ---


