rpms/gambatte/F-19 gambatte-537-minizip.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gambatte.spec, 1.8, 1.9 sources, 1.3, 1.4 gambatte-0.4.0-usesystemlibraries.patch, 1.1, NONE gambatte-0.4.1-cflags.patch, 1.1, NONE gambatte-0.4.1-gcc44.patch, 1.1, NONE gambatte-0.4.1-libraries.patch, 1.1, NONE

[Andrea Musuruane]

Author: musuruan

Update of /cvs/free/rpms/gambatte/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25307

Modified Files:
	.cvsignore gambatte.spec sources 
Added Files:
	gambatte-537-minizip.patch 
Removed Files:
	gambatte-0.4.0-usesystemlibraries.patch 
	gambatte-0.4.1-cflags.patch gambatte-0.4.1-gcc44.patch 
	gambatte-0.4.1-libraries.patch 
Log Message:
* Mon Jul 01 2013 Andrea Musuruane <musuruan at gmail.com> - 537-1
- Updated to upstream r537
- Dropped obsolete Group, Buildroot, %clean and %defattr


gambatte-537-minizip.patch:
 SConstruct            |    4 +---
 src/file/file_zip.cpp |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE gambatte-537-minizip.patch ---
diff -durN gambatte_src-r537.orig/libgambatte/SConstruct gambatte_src-r537/libgambatte/SConstruct
--- gambatte_src-r537.orig/libgambatte/SConstruct	2013-06-01 16:43:58.000000000 +0200
+++ gambatte_src-r537/libgambatte/SConstruct	2013-07-01 14:39:15.599514127 +0200
@@ -44,9 +44,7 @@
 
 conf = env.Configure()
 
-if conf.CheckHeader('zlib.h'):
-	sourceFiles.append('src/file/unzip/unzip.c')
-	sourceFiles.append('src/file/unzip/ioapi.c')
+if conf.CheckLib('z', autoadd=1) and conf.CheckLib('minizip', autoadd=1):
 	sourceFiles.append('src/file/file_zip.cpp')
 else:
 	sourceFiles.append('src/file/file.cpp')
diff -durN gambatte_src-r537.orig/libgambatte/src/file/file_zip.cpp gambatte_src-r537/libgambatte/src/file/file_zip.cpp
--- gambatte_src-r537.orig/libgambatte/src/file/file_zip.cpp	2013-06-01 16:43:58.000000000 +0200
+++ gambatte_src-r537/libgambatte/src/file/file_zip.cpp	2013-07-01 14:39:57.325515266 +0200
@@ -24,7 +24,7 @@
 #include <cstring>
 
 namespace zlib {
-#include "unzip/unzip.h"
+#include <minizip/unzip.h>
 }
 
 namespace {


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gambatte/F-19/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Jan 2009 18:00:04 -0000	1.3
+++ .cvsignore	11 Jul 2013 15:14:52 -0000	1.4
@@ -1 +1 @@
-gambatte_src-0.4.1.tar.gz
+gambatte_src-r537.tar.gz


Index: gambatte.spec
===================================================================
RCS file: /cvs/free/rpms/gambatte/F-19/gambatte.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gambatte.spec	3 Mar 2013 21:37:32 -0000	1.8
+++ gambatte.spec	11 Jul 2013 15:14:53 -0000	1.9
@@ -3,25 +3,19 @@
 %define soname lib%{libname}.so
 
 Name: gambatte
-Version: 0.4.1
-Release: 7%{?dist}
+Version: 537
+Release: 1%{?dist}
 Summary: An accuracy-focused Game Boy / Game Boy Color emulator 
 
-Group: Applications/Emulators
 License: GPLv2
 URL: http://sourceforge.net/projects/gambatte/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}_src-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}_src-r%{version}.tar.gz
 Source1: gambatte-qt.desktop
 # Icon made by Peter Verschoor
 Source2: gameboy_icon.png
 # Andrea Musuruane
-Patch0: %{name}-0.4.1-cflags.patch
-Patch1: %{name}-0.4.0-usesystemlibraries.patch
-# https://sourceforge.net/tracker/?func=detail&aid=2731060&group_id=203791&atid=987012
-Patch2: %{name}-0.4.1-gcc44.patch 
-# Upstream SVN
-Patch3: %{name}-0.4.1-libraries.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Use system minizip
+Patch0: %{name}-537-minizip.patch
 
 BuildRequires: scons
 BuildRequires: minizip-devel
@@ -29,7 +23,7 @@
 BuildRequires: qt4-devel
 BuildRequires: libXv-devel
 BuildRequires: desktop-file-utils
-BuildRequires:  ImageMagick
+BuildRequires: ImageMagick
 Requires: hicolor-icon-theme
 
 
@@ -90,22 +84,24 @@
 
 
 %prep
-%setup -q -n %{name}_src-%{version}
+%setup -q -n %{name}_src-r%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 # Fix file encoding
-for txtfile in README \
-    gambatte_qt/man/gambatte_qt.6 \
-    gambatte_sdl/man/gambatte_sdl.6; 
+for txtfile in README
 do
     iconv --from=ISO-8859-1 --to=UTF-8 $txtfile > tmp
     touch -r $txtfile tmp
     mv tmp $txtfile
 done
 
+# Fix premissions
+find . \( -name *.cpp -o -name *.h \) -exec chmod 644 {} \;
+
+# Use RPM_OPT_FLAGS
+sed -i '/QMAKE_CFLAGS/d' gambatte_qt/src/src.pro
+sed -i '/QMAKE_CXXFLAGS/d' gambatte_qt/src/src.pro
+
 # Build a dynamic library
 sed -i '/^env.Library/i\
 env.AppendUnique(SHLINKFLAGS="-Wl,-soname=%{soname}")' libgambatte/SConstruct
@@ -114,7 +110,7 @@
 # Change library name to avoid future collisions with upstream
 sed -i "s/'%{libname_u}'/'%{libname}'/" libgambatte/SConstruct
 sed -i 's/-l%{libname_u}/-l%{libname}/' gambatte_qt/src/src.pro
-sed -i "s/'%{libname_u}'/'%{libname}'/" gambatte_sdl/SConstruct
+sed -i "s/libgambatte.a/%{soname}/" gambatte_sdl/SConstruct
 
 
 %build
@@ -130,7 +126,7 @@
 popd
 
 pushd gambatte_qt
-qmake-qt4
+qmake-qt4 
 make %{?_smp_mflags}
 popd
 
@@ -151,11 +147,6 @@
 install -m 755 gambatte_sdl/gambatte_sdl %{buildroot}%{_bindir}
 install -m 755 gambatte_qt/bin/gambatte_qt %{buildroot}%{_bindir}
 
-# Install man files
-install -d -m 755 %{buildroot}%{_mandir}/man6
-install -m 644 gambatte_sdl/man/gambatte_sdl.6 %{buildroot}%{_mandir}/man6
-install -m 644 gambatte_qt/man/gambatte_qt.6 %{buildroot}%{_mandir}/man6
-
 # install desktop file
 mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor '' \
@@ -188,33 +179,23 @@
 
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files -n libgambatte
-%defattr(-,root,root,-)
 %{_libdir}/%{soname}
 %doc changelog COPYING README
 
 
 %files -n libgambatte-devel
-%defattr(-,root,root,-)
 %{_includedir}/%{name}
 %doc changelog COPYING README
 
 
 %files sdl
-%defattr(-,root,root,-)
 %{_bindir}/gambatte_sdl
-%{_mandir}/man6/gambatte_sdl.6*
 %doc changelog COPYING README
 
 
 %files qt
-%defattr(-,root,root,-)
 %{_bindir}/gambatte_qt 
-%{_mandir}/man6/gambatte_qt.6*
 %{_datadir}/icons/hicolor/32x32/apps/gambatte-qt.png
 %{_datadir}/icons/hicolor/64x64/apps/gambatte-qt.png
 %{_datadir}/applications/gambatte-qt.desktop
@@ -222,6 +203,10 @@
 
 
 %changelog
+* Mon Jul 01 2013 Andrea Musuruane <musuruan at gmail.com> - 537-1
+- Updated to upstream r537
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+
 * Sun Mar 03 2013 Nicolas Chauvet <kwizart at gmail.com> - 0.4.1-7
 - Mass rebuilt for Fedora 19 Features
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/gambatte/F-19/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Jan 2009 18:00:04 -0000	1.3
+++ sources	11 Jul 2013 15:14:53 -0000	1.4
@@ -1 +1 @@
-cfe52c33bbb2e719a957bde64427a18c  gambatte_src-0.4.1.tar.gz
+0c9816a9f55872a8df5da06223b83074  gambatte_src-r537.tar.gz


--- gambatte-0.4.0-usesystemlibraries.patch DELETED ---


--- gambatte-0.4.1-cflags.patch DELETED ---


--- gambatte-0.4.1-gcc44.patch DELETED ---


--- gambatte-0.4.1-libraries.patch DELETED ---