rpms/scummvm/devel scummvm-0.11.0-nostrip.patch, NONE, 1.1 scummvm.spec, 1.8, 1.9 scummvm-0.10.0-gcc43.patch, 1.1, NONE scummvm-0.9.0-nostrip.patch, 1.1, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	scummvm.spec 
Added Files:
	scummvm-0.11.0-nostrip.patch 
Removed Files:
	scummvm-0.10.0-gcc43.patch scummvm-0.9.0-nostrip.patch 
Log Message:
* Wed Jan 16 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.11.0-1
- New upstream version 0.11.0
- Drop no longer needed gcc 4.3 patch


scummvm-0.11.0-nostrip.patch:

--- NEW FILE scummvm-0.11.0-nostrip.patch ---
diff -up scummvm-0.11.0/ports.mk~ scummvm-0.11.0/ports.mk
--- scummvm-0.11.0/ports.mk~	2008-01-17 10:08:37.000000000 +0100
+++ scummvm-0.11.0/ports.mk	2008-01-17 10:08:37.000000000 +0100
@@ -7,7 +7,7 @@
 #
 install: all
 	$(INSTALL) -d "$(DESTDIR)$(BINDIR)"
-	$(INSTALL) -c -s -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
+	$(INSTALL) -c -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
 	$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/"
 	$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6"
 	$(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/"


Index: scummvm.spec
===================================================================
RCS file: /cvs/extras/rpms/scummvm/devel/scummvm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scummvm.spec	16 Jan 2008 22:55:21 -0000	1.8
+++ scummvm.spec	17 Jan 2008 09:16:50 -0000	1.9
@@ -8,9 +8,8 @@
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 #######         Icons extracted from icons/scummvm.ico with the gimp
 Source1:        scummvm-icons.tar.gz
-Patch0:         scummvm-0.9.0-nostrip.patch
+Patch0:         scummvm-0.11.0-nostrip.patch
 Patch1:         scummvm-0.9.1-no-execstack.patch
-Patch2:         scummvm-0.10.0-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel libvorbis-devel flac-devel zlib-devel
 BuildRequires:  desktop-file-utils
@@ -32,9 +31,8 @@
 
 %prep
 %setup -q -a 1
-#%patch0 -p1 -b .nostrip
+%patch0 -p1 -b .nostrip
 %patch1 -p1 -b .execstack
-#%patch2 -p1 -b .gcc
 sed -i 's/%{name}.xpm/%{name}.png/' dists/%{name}.desktop
 sed -i 's/Application;Game;AdventureGame;/Game;Emulator;/' \
   dists/%{name}.desktop
@@ -108,6 +106,7 @@
 %changelog
 * Wed Jan 16 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.11.0-1
 - New upstream version 0.11.0
+- Drop no longer needed gcc 4.3 patch
 
 * Sat Jan 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-3
 - Fix compilation with gcc 4.3


--- scummvm-0.10.0-gcc43.patch DELETED ---


--- scummvm-0.9.0-nostrip.patch DELETED ---