Author: musuruan Update of /cvs/free/rpms/fceux/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18367 Modified Files: .cvsignore fceux.spec sources Removed Files: fceux-2.2.1-fix_format_string_security_error.patch fceux-2.2.1-set-script-and-palette-gtkfilechooser-default-directory.patch fceux-2.2.1-use_system_lua.patch Log Message: * Sat Oct 19 2013 Andrea Musuruane <musuruan(a)gmail.com&gt; - 2.2.2-1 - Updated to new upstream realease - Removed non longer needed patches - Built with compat-lua for F20+ Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/fceux/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Apr 2013 17:36:45 -0000 1.3 +++ .cvsignore 20 Oct 2013 12:35:21 -0000 1.4 @@ -1 +1 @@ -fceux-2.2.1.src.tar.gz +fceux-2.2.2.src.tar.gz Index: fceux.spec =================================================================== RCS file: /cvs/free/rpms/fceux/devel/fceux.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fceux.spec 12 Jun 2013 07:41:10 -0000 1.4 +++ fceux.spec 20 Oct 2013 12:35:21 -0000 1.5 @@ -1,25 +1,22 @@ Name: fceux -Version: 2.2.1 -Release: 2%{?dist} +Version: 2.2.2 +Release: 1%{?dist} Summary: A cross platform, NTSC and PAL Famicom/NES emulator Group: Applications/Emulators License: GPLv2+ URL: http://fceux.com/ Source: http://downloads.sourceforge.net/fceultra/%{name}-%{version}.src.tar.gz -# Patches from Debian -# Fix format string -Patch0: %{name}-2.2.1-fix_format_string_security_error.patch -# Set default GtkFileChooser directory for scripts and palettes -Patch1: %{name}-2.2.1-set-script-and-palette-gtkfilechooser-default-directory.patch -# Use system Lua instead of bundled version -Patch2: %{name}-2.2.1-use_system_lua.patch BuildRequires: scons BuildRequires: SDL-devel >= 1.2.14 BuildRequires: gtk2-devel >= 2.18 BuildRequires: gd-devel -BuildRequires: lua-devel >= 5.1 +%if 0%{?fedora} >= 20 +BuildRequires: compat-lua-devel +%else +BuildRequires: lua-devel +%endif BuildRequires: minizip-devel BuildRequires: desktop-file-utils Requires: hicolor-icon-theme @@ -51,9 +48,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 # Remove windows binary rm fceux-server/fceux-net-server.exe @@ -66,7 +60,9 @@ # Remove bundled LUA library rm -rf src/lua -sed -i 's/^lua//' src/SConscript + +# Fix for LUA 5.1 +sed -i 's/lua5.1/lua-5.1/' SConstruct # Remove bundled minizip library rm -rf src/utils/unzip.* @@ -76,15 +72,19 @@ documentation/Videolog.txt \ fceux-server/{AUTHORS,ChangeLog,README} -# Fix icon path in desktop file +# Fix desktop file sed -i 's/\/usr\/share\/pixmaps\/fceux.png/fceux/' fceux.desktop +sed -i '/MimeType=*/s/$/;/' fceux.desktop +sed -i '/OnlyShowIn=*/s/$/;/' fceux.desktop %build export CFLAGS="%{optflags}" +# Enable system LUA # Enable system minizip # Enable AVI creation scons %{?_smp_mflags} \ + SYSTEM_LUA=1 \ SYSTEM_MINIZIP=1 \ CREATE_AVI=1 @@ -97,8 +97,8 @@ # Install data install -d %{buildroot}%{_datadir}/%{name} -install -p -m 644 bin/auxlib.lua %{buildroot}%{_datadir}/%{name} -cp -pR output/* %{buildroot}%{_datadir}/%{name} +cp -pR output/{palettes,luaScripts} %{buildroot}%{_datadir}/%{name} +install -p -m 644 bin/auxlib.lua %{buildroot}%{_datadir}/%{name}/luaScripts/ # Install icon install -d %{buildroot}%{_datadir}/icons/hicolor/32x32/apps @@ -155,6 +155,11 @@ %changelog +* Sat Oct 19 2013 Andrea Musuruane <musuruan(a)gmail.com&gt; - 2.2.2-1 +- Updated to new upstream realease +- Removed non longer needed patches +- Built with compat-lua for F20+ + * Wed Jun 12 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.2.1-2 - Rebuilt for GD 2.1.0 Index: sources =================================================================== RCS file: /cvs/free/rpms/fceux/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Apr 2013 17:36:46 -0000 1.3 +++ sources 20 Oct 2013 12:35:21 -0000 1.4 @@ -1 +1 @@ -696d0186afb17f3b70d4aa9e9f5cf1d1 fceux-2.2.1.src.tar.gz +eb6b01218f56fc28cb31b3a836b65918 fceux-2.2.2.src.tar.gz --- fceux-2.2.1-fix_format_string_security_error.patch DELETED --- --- fceux-2.2.1-set-script-and-palette-gtkfilechooser-default-directory.patch DELETED --- --- fceux-2.2.1-use_system_lua.patch DELETED ---