rpms/plus4emu/F-19 plus4emu-1.2.9.2-compat-lua.patch, NONE, 1.1 plus4emu.spec, 1.10, 1.11

Wed Jan 1 12:39:40 CET 2014

Author: musuruan

Update of /cvs/nonfree/rpms/plus4emu/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11986

Modified Files:
	plus4emu.spec 
Added Files:
	plus4emu-1.2.9.2-compat-lua.patch 
Log Message:
* Tue Dec 31 2013 Andrea Musuruane <musuruan at gmail.com> 1.2.9.2-7
- Built with compat-lua for F20+
- Dropped desktop vendor tag for F19+
- Updated icon cache scriptlets
- Dropped obsolete Group, Buildroot, %clean and %defattr
- Dropped cleaning at the beginning of %install


plus4emu-1.2.9.2-compat-lua.patch:
 SConstruct     |    8 ++++----
 src/script.cpp |    6 +++---
 src/script.hpp |    6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE plus4emu-1.2.9.2-compat-lua.patch ---
diff -durN plus4emu-1.2.9.2.orig/SConstruct plus4emu-1.2.9.2/SConstruct
--- plus4emu-1.2.9.2.orig/SConstruct	2008-09-25 00:04:22.000000000 +0200
+++ plus4emu-1.2.9.2/SConstruct	2014-01-01 10:25:47.709279732 +0100
@@ -214,9 +214,9 @@
 else:
     haveSDL = 0
 if not disableLua:
-    haveLua = configure.CheckCHeader('lua.h')
-    haveLua = haveLua and configure.CheckCHeader('lauxlib.h')
-    haveLua = haveLua and configure.CheckCHeader('lualib.h')
+    haveLua = configure.CheckCHeader('lua-5.1/lua.h')
+    haveLua = haveLua and configure.CheckCHeader('lua-5.1/lauxlib.h')
+    haveLua = haveLua and configure.CheckCHeader('lua-5.1/lualib.h')
 else:
     haveLua = 0
 haveZLib = configure.CheckCHeader('zlib.h')
@@ -378,7 +378,7 @@
         plus4emuEnvironment.Append(LIBS = ['mingwex'])
     plus4emuEnvironment.Append(LIBS = ['dotconf'])
 if haveLua:
-    plus4emuEnvironment.Append(LIBS = ['lua'])
+    plus4emuEnvironment.Append(LIBS = ['lua-5.1'])
 if haveSDL:
     plus4emuEnvironment.Append(LIBS = ['SDL'])
 plus4emuEnvironment.Append(LIBS = ['portaudio', 'sndfile'])
diff -durN plus4emu-1.2.9.2.orig/src/script.cpp plus4emu-1.2.9.2/src/script.cpp
--- plus4emu-1.2.9.2.orig/src/script.cpp	2007-12-08 19:44:27.000000000 +0100
+++ plus4emu-1.2.9.2/src/script.cpp	2014-01-01 10:30:28.472265344 +0100
@@ -25,9 +25,9 @@
 
 #ifdef HAVE_LUA_H
 extern "C" {
-#  include "lua.h"
-#  include "lauxlib.h"
-#  include "lualib.h"
+#  include "lua-5.1/lua.h"
+#  include "lua-5.1/lauxlib.h"
+#  include "lua-5.1/lualib.h"
 }
 #endif  // HAVE_LUA_H
 
diff -durN plus4emu-1.2.9.2.orig/src/script.hpp plus4emu-1.2.9.2/src/script.hpp
--- plus4emu-1.2.9.2.orig/src/script.hpp	2007-12-08 19:44:27.000000000 +0100
+++ plus4emu-1.2.9.2/src/script.hpp	2014-01-01 10:30:45.098264492 +0100
@@ -26,9 +26,9 @@
 
 #ifdef HAVE_LUA_H
 extern "C" {
-#  include "lua.h"
-#  include "lauxlib.h"
-#  include "lualib.h"
+#  include "lua-5.1/lua.h"
+#  include "lua-5.1/lauxlib.h"
+#  include "lua-5.1/lualib.h"
 }
 #else
 struct  lua_State;      // dummy declaration


Index: plus4emu.spec
===================================================================
RCS file: /cvs/nonfree/rpms/plus4emu/F-19/plus4emu.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plus4emu.spec	12 Mar 2013 21:42:45 -0000	1.10
+++ plus4emu.spec	1 Jan 2014 11:39:40 -0000	1.11
@@ -2,9 +2,8 @@
 
 Name:           plus4emu
 Version:        1.2.9.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Portable emulator of the Commodore 264 family of computers
-Group:          Applications/Emulators
 License:        GPLv2+
 URL:            http://plus4emu.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -17,11 +16,15 @@
 Patch1:         %{name}-1.2.5-fixpathissue.patch
 Patch2:         %{name}-1.2.9.2-gcc45.patch
 Patch3:         %{name}-1.2.9.2-gcc46.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch4:         %{name}-1.2.9.2-compat-lua.patch
 BuildRequires:  desktop-file-utils
 BuildRequires:  fltk-fluid >= 1.1.0
 BuildRequires:  libsndfile-devel
+%if 0%{?fedora} >= 20
+BuildRequires:  compat-lua-devel
+%else
 BuildRequires:  lua-devel
+%endif
 BuildRequires:  portaudio-devel >= 18
 BuildRequires:  scons
 BuildRequires:  SDL-devel
@@ -39,6 +42,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # Fix EOL chars
 sed -i 's/\r//' README NEWS
@@ -59,7 +63,6 @@
 
 
 %install
-rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 install -pm0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
@@ -68,52 +71,53 @@
 install -pm0755 makecfg %{buildroot}%{_bindir}/%{binprefix}makecfg
 install -pm0755 compress %{buildroot}%{_bindir}/%{binprefix}compress
 
-desktop-file-install --vendor dribble \
-                     --dir %{buildroot}%{_datadir}/applications \
+desktop-file-install --dir %{buildroot}%{_datadir}/applications \
                      %{SOURCE3}
 
-desktop-file-install --vendor '' \
-                     --dir %{buildroot}%{_datadir}/applications \
+desktop-file-install --dir %{buildroot}%{_datadir}/applications \
                      %{SOURCE4}
 
-desktop-file-install --vendor '' \
-                     --dir %{buildroot}%{_datadir}/applications \
+desktop-file-install --dir %{buildroot}%{_datadir}/applications \
                      %{SOURCE5}
 
 # install ROM images
 mkdir -p %{buildroot}%{_datadir}/%{name}/roms
 install -pm0644 roms/* %{buildroot}%{_datadir}/%{name}/roms
 
-%clean
-rm -rf %{buildroot}
-
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files
-%defattr(-,root,root,-)
 %{_bindir}/*
 %{_datadir}/%{name}
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-%{_datadir}/applications/dribble-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/applications/p4fliconv.desktop
 %{_datadir}/applications/%{binprefix}makecfg.desktop
 %doc README COPYING NEWS README.Fedora
 
 
 %changelog
+* Tue Dec 31 2013 Andrea Musuruane <musuruan at gmail.com> 1.2.9.2-7
+- Built with compat-lua for F20+
+- Dropped desktop vendor tag for F19+
+- Updated icon cache scriptlets
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+- Dropped cleaning at the beginning of %%install
+
 * Tue Mar 12 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.2.9.2-6
 - https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -157,7 +161,7 @@
 * Sun Feb 03 2008 Ian Chapman <packages[AT]amiga-hardware.com> 1.2.5-3
 - GCC 4.3 fixes
 
-* Sun Jan 21 2008 Ian Chapman <packages[AT]amiga-hardware.com> 1.2.5-2
+* Sun Jan 20 2008 Ian Chapman <packages[AT]amiga-hardware.com> 1.2.5-2
 - Dropped fltk-devel BR, fltk-fluid pulls it in anyway
 - Minor cleanups
 
