Author: musuruan Update of /cvs/free/rpms/gambatte/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv3373 Modified Files: .cvsignore gambatte.spec sources Added Files: gambatte-0.4.1-cflags.patch Removed Files: gambatte-0.4.0-alsa.patch gambatte-0.4.0-cflags.patch Log Message: * Sat Jan 31 2009 Andrea Musuruane <musuruan(a)gmail.com&gt; - 0.4.1-1 - Updated to upstream 0.4.1 - Changed back to qt4-devel from qt-devel in BR - Changed descriptions to match the one upstream uses - Dropped alsa patch, applied upstream - Changed libname to avoid future collisions with upstream gambatte-0.4.1-cflags.patch: --- NEW FILE gambatte-0.4.1-cflags.patch --- diff -dur gambatte_src-0.4.1.orig/gambatte_qt/src/framework/framework.pro gambatte_src-0.4.1/gambatte_qt/src/framework/framework.pro --- gambatte_src-0.4.1.orig/gambatte_qt/src/framework/framework.pro 2009-01-10 23:32:09.000000000 +0100 +++ gambatte_src-0.4.1/gambatte_qt/src/framework/framework.pro 2009-01-11 10:40:28.000000000 +0100 @@ -68,7 +68,6 @@ INCLUDEPATH += framework/SDL_Joystick/include INCLUDEPATH += $$COMMONPATH DEFINES += HAVE_STDINT_H -QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti macx { # CONFIG += x86 ppc diff -dur gambatte_src-0.4.1.orig/gambatte_sdl/SConstruct gambatte_src-0.4.1/gambatte_sdl/SConstruct --- gambatte_src-0.4.1.orig/gambatte_sdl/SConstruct 2009-01-10 22:47:57.000000000 +0100 +++ gambatte_src-0.4.1/gambatte_sdl/SConstruct 2009-01-11 10:40:28.000000000 +0100 @@ -1,5 +1,5 @@ -global_cflags = ARGUMENTS.get('CFLAGS', '-Wall -Wextra -O2 -fomit-frame-pointer') -global_cxxflags = ARGUMENTS.get('CXXFLAGS', global_cflags + ' -fno-exceptions -fno-rtti') +global_cflags = ARGUMENTS.get('CFLAGS') +global_cxxflags = ARGUMENTS.get('CXXFLAGS') global_defines = ' -DHAVE_STDINT_H' env = Environment(CPPPATH = ['src', '../libgambatte/include', '../common'], diff -dur gambatte_src-0.4.1.orig/libgambatte/SConstruct gambatte_src-0.4.1/libgambatte/SConstruct --- gambatte_src-0.4.1.orig/libgambatte/SConstruct 2009-01-10 22:47:58.000000000 +0100 +++ gambatte_src-0.4.1/libgambatte/SConstruct 2009-01-11 10:40:28.000000000 +0100 @@ -1,5 +1,5 @@ -global_cflags = ARGUMENTS.get('CFLAGS', '-Wall -Wextra -O2 -fomit-frame-pointer') -global_cxxflags = ARGUMENTS.get('CXXFLAGS', global_cflags + ' -fno-exceptions -fno-rtti') +global_cflags = ARGUMENTS.get('CFLAGS') +global_cxxflags = ARGUMENTS.get('CXXFLAGS') global_defines = ' -DHAVE_STDINT_H -DCHAR_WIDTH_8' env = Environment(CPPPATH = ['src', 'include', '../common'], Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/gambatte/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Dec 2008 09:26:48 -0000 1.2 +++ .cvsignore 31 Jan 2009 18:00:04 -0000 1.3 @@ -1 +1 @@ -gambatte_src-0.4.0.tar.gz +gambatte_src-0.4.1.tar.gz Index: gambatte.spec =================================================================== RCS file: /cvs/free/rpms/gambatte/devel/gambatte.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gambatte.spec 4 Dec 2008 09:26:48 -0000 1.1 +++ gambatte.spec 31 Jan 2009 18:00:04 -0000 1.2 @@ -1,9 +1,10 @@ -%define libname lib%{name}.so -%define soname %{libname}.0 +%define libname_u %{name} +%define libname %{name}-%{version} +%define soname lib%{libname}.so Name: gambatte -Version: 0.4.0 -Release: 4%{?dist} +Version: 0.4.1 +Release: 1%{?dist} Summary: An accuracy-focused Game Boy / Game Boy Color emulator Group: Applications/Emulators @@ -11,18 +12,17 @@ URL: http://sourceforge.net/projects/gambatte/ Source0: http://dl.sf.net/sourceforge/%{name}/%{name}_src-%{version}.tar.gz Source1: gambatte-qt.desktop +# Icon made by Peter Verschoor Source2: gameboy_icon.png # Andrea Musuruane -Patch0: %{name}-0.4.0-cflags.patch +Patch0: %{name}-0.4.1-cflags.patch Patch1: %{name}-0.4.0-usesystemlibraries.patch -# Patch submitted upstream SF #2377772 -Patch2: %{name}-0.4.0-alsa.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: scons BuildRequires: minizip-devel BuildRequires: SDL-devel -BuildRequires: qt-devel >= 4 +BuildRequires: qt4-devel BuildRequires: libXv-devel BuildRequires: desktop-file-utils BuildRequires: ImageMagick @@ -31,7 +31,7 @@ %description Gambatte is an accuracy-focused, open-source, cross-platform -Game Boy / Game Boy Color emulator written in C++. It is based on hundreds of +Game Boy Color emulator written in C++. It is based on hundreds of corner case hardware tests, as well as previous documentation and reverse engineering efforts. @@ -42,7 +42,7 @@ %description -n libgambatte Gambatte is an accuracy-focused, open-source, cross-platform -Game Boy / Game Boy Color emulator written in C++. It is based on hundreds of +Game Boy Color emulator written in C++. It is based on hundreds of corner case hardware tests, as well as previous documentation and reverse engineering efforts. @@ -65,7 +65,7 @@ %description qt Gambatte is an accuracy-focused, open-source, cross-platform -Game Boy / Game Boy Color emulator written in C++. It is based on hundreds of +Game Boy Color emulator written in C++. It is based on hundreds of corner case hardware tests, as well as previous documentation and reverse engineering efforts. @@ -78,7 +78,7 @@ %description sdl Gambatte is an accuracy-focused, open-source, cross-platform -Game Boy / Game Boy Color emulator written in C++. It is based on hundreds of +Game Boy Color emulator written in C++. It is based on hundreds of corner case hardware tests, as well as previous documentation and reverse engineering efforts. @@ -89,7 +89,6 @@ %setup -q -n %{name}_src-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 # Fix file encoding for txtfile in README \ @@ -106,6 +105,11 @@ env.AppendUnique(SHLINKFLAGS="-Wl,-soname=%{soname}")' libgambatte/SConstruct sed -i 's/env.Library/env.SharedLibrary/' libgambatte/SConstruct +# 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 + %build export QMAKE_CFLAGS="%{optflags}" @@ -113,10 +117,6 @@ pushd libgambatte scons %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" -# Make symlinks now as they are needed -mv %{libname} %{soname} -ln -s %{soname} %{libname}.%{version} -ln -s %{soname} %{libname} popd pushd gambatte_sdl @@ -136,11 +136,9 @@ install -d -m 755 %{buildroot}%{_includedir}/%{name} install -m 644 libgambatte/include/* %{buildroot}%{_includedir}/%{name} -# Install lib and symlinks +# Install lib install -d -m 755 %{buildroot}%{_libdir} install -m 755 libgambatte/%{soname} %{buildroot}%{_libdir} -mv libgambatte/%{libname}.%{version} %{buildroot}%{_libdir} -mv libgambatte/%{libname} %{buildroot}%{_libdir} # Install bin files install -d -m 755 %{buildroot}%{_bindir} @@ -190,14 +188,12 @@ %files -n libgambatte %defattr(-,root,root,-) -%{_libdir}/%{libname}.%{version} %{_libdir}/%{soname} %doc changelog COPYING README %files -n libgambatte-devel %defattr(-,root,root,-) -%{_libdir}/%{libname} %{_includedir}/%{name} %doc changelog COPYING README @@ -220,6 +216,13 @@ %changelog +* Sat Jan 31 2009 Andrea Musuruane <musuruan(a)gmail.com&gt; - 0.4.1-1 +- Updated to upstream 0.4.1 +- Changed back to qt4-devel from qt-devel in BR +- Changed descriptions to match the one upstream uses +- Dropped alsa patch, applied upstream +- Changed libname to avoid future collisions with upstream + * Tue Dec 02 2008 Andrea Musuruane <musuruan(a)gmail.com&gt; - 0.4.0-4 - Changed qt4-devel to qt-devel in BR - Added a patch to compile alsa under linux 64bit systems Index: sources =================================================================== RCS file: /cvs/free/rpms/gambatte/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Dec 2008 09:26:48 -0000 1.2 +++ sources 31 Jan 2009 18:00:04 -0000 1.3 @@ -1 +1 @@ -c0e0976eadb21a46716a5bb07d9e6cef gambatte_src-0.4.0.tar.gz +cfe52c33bbb2e719a957bde64427a18c gambatte_src-0.4.1.tar.gz --- gambatte-0.4.0-alsa.patch DELETED --- --- gambatte-0.4.0-cflags.patch DELETED ---