rpms/scummvm/F-12 scummvm-1.0.0-nostrip.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 scummvm.spec, 1.18, 1.19 sources, 1.10, 1.11 scummvm-0.12.0-gcc44.patch, 1.1, NONE scummvm-0.13.0-nostrip.patch, 1.1, NONE

[Lucian Langa]

Author: lucilanga

Update of /cvs/pkgs/rpms/scummvm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1554

Modified Files:
	.cvsignore scummvm.spec sources 
Added Files:
	scummvm-1.0.0-nostrip.patch 
Removed Files:
	scummvm-0.12.0-gcc44.patch scummvm-0.13.0-nostrip.patch 
Log Message:
* Wed Nov 25 2009 Lucian Langa <cooly at gnome.eu.org> - 1.0.0-1
- drop patch1 - fixed upstream
- update patch0 to 1.0.0 release
- new upstream release

scummvm-1.0.0-nostrip.patch:
 config.log |    1 +
 ports.mk   |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE scummvm-1.0.0-nostrip.patch ---
diff -Naur scummvm-1.0.0/config.log scummvm-1.0.0-mod/config.log
--- scummvm-1.0.0/config.log	1970-01-01 02:00:00.000000000 +0200
+++ scummvm-1.0.0-mod/config.log	2009-11-25 21:53:23.000000000 +0200
@@ -0,0 +1 @@
+Configure run on Wed Nov 25 21:53:23 EET 2009
diff -Naur scummvm-1.0.0/ports.mk scummvm-1.0.0-mod/ports.mk
--- scummvm-1.0.0/ports.mk	2009-11-07 02:10:17.000000000 +0200
+++ scummvm-1.0.0-mod/ports.mk	2009-11-25 22:07:53.000000000 +0200
@@ -10,7 +10,7 @@
 #
 install: all
 	$(INSTALL) -d "$(DESTDIR)$(BINDIR)"
-	$(INSTALL) -c -s -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(BINDIR)/$(EXECUTABLE)"
+	$(INSTALL) -c -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(BINDIR)/$(EXECUTABLE)"
 	$(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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scummvm/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	28 Apr 2009 05:40:48 -0000	1.10
+++ .cvsignore	25 Nov 2009 20:52:30 -0000	1.11
@@ -1,2 +1,2 @@
-scummvm-0.13.1.tar.bz2
+scummvm-1.0.0.tar.bz2
 scummvm-icons.tar.gz


Index: scummvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scummvm/F-12/scummvm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- scummvm.spec	27 Jul 2009 04:03:40 -0000	1.18
+++ scummvm.spec	25 Nov 2009 20:52:30 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           scummvm
-Version:        0.13.1
-Release:        2%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        Interpreter for several adventure games
 Group:          Applications/Emulators
 License:        GPLv2+
@@ -8,8 +8,7 @@ URL:            http://scummvm.sourcefor
 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.13.0-nostrip.patch
-Patch1:         scummvm-0.12.0-gcc44.patch
+Patch0:         scummvm-1.0.0-nostrip.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel libvorbis-devel flac-devel zlib-devel
 BuildRequires:  fluidsynth-devel desktop-file-utils
@@ -32,7 +31,6 @@ Also ScummVM is capable of playing sever
 %prep
 %setup -q -a 1
 %patch0 -p1 -b .nostrip
-%patch1 -p1 -b .gcc44
 sed -i 's/%{name}.xpm/%{name}/' dists/%{name}.desktop
 sed -i 's/Application;Game;AdventureGame;/Game;Emulator;/' \
   dists/%{name}.desktop
@@ -45,7 +43,7 @@ sed -i 's/Application;Game;AdventureGame
 # The disables are so that these don't accidently get build in when rebuilding
 # on a system with the necesarry deps installed
 ./configure --prefix=%{_prefix} --bindir=%{_bindir} --mandir=%{_mandir} \
-  --datadir=%{_datadir} --disable-mpeg2 --disable-mad
+  --datadir=%{_datadir} --disable-mad
 make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS"
 
 
@@ -100,6 +98,11 @@ fi
 
 
 %changelog
+* Wed Nov 25 2009 Lucian Langa <cooly at gnome.eu.org> - 1.0.0-1
+- drop patch1 - fixed upstream
+- update patch0 to 1.0.0 release
+- new upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scummvm/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	28 Apr 2009 05:40:48 -0000	1.10
+++ sources	25 Nov 2009 20:52:30 -0000	1.11
@@ -1,2 +1,2 @@
-843d9cd4470022bd3b269eb84298dc16  scummvm-0.13.1.tar.bz2
+11b911937e0fc73c94a7bdc374ab617c  scummvm-1.0.0.tar.bz2
 b20d750de2c88e8aefea364afae1776c  scummvm-icons.tar.gz


--- scummvm-0.12.0-gcc44.patch DELETED ---


--- scummvm-0.13.0-nostrip.patch DELETED ---