rpms/scummvm/devel .cvsignore, 1.2, 1.3 scummvm.spec, 1.4, 1.5 sources, 1.2, 1.3 scummvm-0.9.0-gcc41.patch, 1.1, NONE scummvm-0.9.1-new-flac.patch, 1.1, NONE

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/scummvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19340

Modified Files:
	.cvsignore scummvm.spec sources 
Removed Files:
	scummvm-0.9.0-gcc41.patch scummvm-0.9.1-new-flac.patch 
Log Message:
Update to 0.10.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scummvm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2006 09:25:57 -0000	1.2
+++ .cvsignore	21 Jun 2007 08:54:10 -0000	1.3
@@ -1,2 +1,2 @@
-scummvm-0.9.1.tar.bz2
+scummvm-0.10.0.tar.bz2
 scummvm-icons.tar.gz


Index: scummvm.spec
===================================================================
RCS file: /cvs/extras/rpms/scummvm/devel/scummvm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scummvm.spec	16 Feb 2007 09:10:08 -0000	1.4
+++ scummvm.spec	21 Jun 2007 08:54:10 -0000	1.5
@@ -1,17 +1,15 @@
 Name:           scummvm
-Version:        0.9.1
-Release:        3%{?dist}
+Version:        0.10.0
+Release:        1%{?dist}
 Summary:        Interpreter for several adventure games
 Group:          Applications/Emulators
 License:        GPL
 URL:            http://scummvm.sourceforge.net/
-Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://downloads.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 #######         Icons extracted from icons/scummvm.ico with the gimp
 Source1:        scummvm-icons.tar.gz
-Patch0:         scummvm-0.9.0-gcc41.patch
-Patch1:         scummvm-0.9.0-nostrip.patch
-Patch2:         scummvm-0.9.1-new-flac.patch
-Patch3:         scummvm-0.9.1-no-execstack.patch
+Patch0:         scummvm-0.9.0-nostrip.patch
+Patch1:         scummvm-0.9.1-no-execstack.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel libvorbis-devel flac-devel zlib-devel
 BuildRequires:  desktop-file-utils
@@ -33,10 +31,8 @@
 
 %prep
 %setup -q -a 1
-%patch0 -p1 -b .gcc41
-%patch1 -p1 -b .nostrip
-%patch2 -p2 -b .flac
-%patch3 -p1 -b .execstack
+%patch0 -p1 -b .nostrip
+%patch1 -p1 -b .execstack
 sed -i 's/%{name}.xpm/%{name}.png/' dists/%{name}.desktop
 sed -i 's/Application;Game;AdventureGame;/Game;Emulator;/' \
   dists/%{name}.desktop
@@ -60,7 +56,7 @@
     $RPM_BUILD_ROOT%{_datadir}/%{name}/modern.ini
 install -D -p -m 0644 gui/themes/modern.zip \
     $RPM_BUILD_ROOT%{_datadir}/%{name}/modern.zip
-# Remove doc files we want to include with %doc
+# Remove doc files we want to include with %%doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/
 
 # below is the desktop file and icon stuff.
@@ -69,17 +65,13 @@
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   dists/%{name}.desktop
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
-install -m 644 %{name}-16x16.png \
+install -D -p -m 0644 %{name}-16x16.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -m 644 %{name}-32x32.png \
+install -D -p -m 0644 %{name}-32x32.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -m 644 %{name}-48x48.png \
+install -D -p -m 0644 %{name}-48x48.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-install -m 644 %{name}-128x128.png \
+install -D -p -m 0644 %{name}-128x128.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.xpm
 
@@ -105,13 +97,19 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/%{name}
-%{_datadir}/%{name}
+%{_datadir}/%{name}/
 %{_mandir}/man6/%{name}.6*
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 
 %changelog
+* Thu Jun 21 2007 Matthias Saou <http://freshrpms.net/> 0.10.0-1
+- Update to 0.10.0, since Hans is away for a few days ;-)
+- Install icons the same way as the theme, and preserve timestamps.
+- Use a downloads.sf.net source URL.
+- Remove two no longer needed patches (gcc41 and new-flac).
+
 * Thu Feb 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-3
 - Take patches from svn for new flac support and rebuild for new flac
 - Fix (remove) execstack usage


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scummvm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2006 09:25:57 -0000	1.2
+++ sources	21 Jun 2007 08:54:10 -0000	1.3
@@ -1,2 +1,2 @@
-30a82ad466bae223875e66ee14b94904  scummvm-0.9.1.tar.bz2
+398bbd5616a54aae8dbe7d9e6c55f064  scummvm-0.10.0.tar.bz2
 b20d750de2c88e8aefea364afae1776c  scummvm-icons.tar.gz


--- scummvm-0.9.0-gcc41.patch DELETED ---


--- scummvm-0.9.1-new-flac.patch DELETED ---