rpmfusion-commits
January 2014
rpmfusion-commits@lists.rpmfusion.org
- 19 participants
- 264 discussions
rpms/mpv/devel .cvsignore, 1.5, 1.6 mpv.spec, 1.18, 1.19 sources, 1.5, 1.6 mpv-format-security.patch, 1.1, NONE
by Miro Hrončok
Author: churchyard
Update of /cvs/free/rpms/mpv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21341
Modified Files:
.cvsignore mpv.spec sources
Removed Files:
mpv-format-security.patch
Log Message:
* Wed Jan 01 2014 Miro Hrončok <mhroncok(a)redhat.com> - 0.3.0-1
- New version 0.3.0
- Switch to waf
- Add some tricks from openSUSE
- Removed already included patch
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mpv/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 15 Dec 2013 18:40:23 -0000 1.5
+++ .cvsignore 1 Jan 2014 17:02:42 -0000 1.6
@@ -1 +1 @@
-v0.2.4.tar.gz
+v0.3.0.tar.gz
Index: mpv.spec
===================================================================
RCS file: /cvs/free/rpms/mpv/devel/mpv.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mpv.spec 22 Dec 2013 21:12:37 -0000 1.18
+++ mpv.spec 1 Jan 2014 17:02:42 -0000 1.19
@@ -1,6 +1,6 @@
Name: mpv
-Version: 0.2.4
-Release: 8%{?dist}
+Version: 0.3.0
+Release: 1%{?dist}
Summary: Movie player playing most video formats and DVDs
License: GPLv2+
URL: http://%{name}.io/
@@ -10,15 +10,14 @@
# set defaults for Fedora
Patch0: %{name}-config.patch
-# https://github.com/mpv-player/mpv/pull/422
-Patch1: %{name}-format-security.patch
-
BuildRequires: aalib-devel
BuildRequires: alsa-lib-devel
BuildRequires: bzip2-devel
BuildRequires: desktop-file-utils
BuildRequires: ffmpeg-devel
BuildRequires: ffmpeg-libs
+BuildRequires: libcdio-devel
+BuildRequires: libcdio-paranoia-devel
BuildRequires: libGL-devel
BuildRequires: libXScrnSaver-devel
BuildRequires: libXinerama-devel
@@ -39,6 +38,7 @@
BuildRequires: lua-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: python-docutils
+BuildRequires: waf
BuildRequires: wayland-devel
Requires: hicolor-icon-theme
@@ -53,27 +53,27 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
-./configure \
- --prefix=%{_prefix} \
- --bindir=%{_bindir} \
- --mandir=%{_mandir} \
- --confdir=%{_sysconfdir}/%{name} \
- --extra-cflags="$RPM_OPT_FLAGS" \
+CCFLAGS="%{optflags}" \
+waf configure \
+ --prefix="%{_prefix}" \
+ --bindir="%{_bindir}" \
+ --mandir="%{_mandir}" \
+ --docdir="%{_docdir}/%{name}" \
+ --confdir="%{_sysconfdir}/%{name}" \
--enable-joystick \
--enable-lirc \
--enable-radio \
--enable-radio-capture \
- --enable-smb \
- --disable-termcap \
- --extra-cflags='-I/usr/include/samba-4.0/'
+ --disable-sdl --disable-sdl2 \
+ --disable-build-date \
+ --disable-debug
-make %{?_smp_mflags}
+waf build --verbose %{?_smp_mflags}
%install
-make install DESTDIR=%{buildroot}
+waf --destdir=%{buildroot} install %{?_smp_mflags}
# Default config files
install -Dpm 644 etc/example.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
@@ -107,11 +107,18 @@
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_mandir}/man1/%{name}.*
-%{_sysconfdir}/%{name}
+%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%config(noreplace) %{_sysconfdir}/%{name}/encoding-profiles.conf
%config(noreplace) %{_sysconfdir}/%{name}/input.conf
%changelog
+* Wed Jan 01 2014 Miro Hrončok <mhroncok(a)redhat.com> - 0.3.0-1
+- New version 0.3.0
+- Switch to waf
+- Add some tricks from openSUSE
+- Removed already included patch
+
* Sun Dec 22 2013 Miro Hrončok <mhroncok(a)redhat.com> - 0.2.4-8
- Added patch for https://fedoraproject.org/wiki/Changes/FormatSecurity
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mpv/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 15 Dec 2013 18:40:23 -0000 1.5
+++ sources 1 Jan 2014 17:02:42 -0000 1.6
@@ -1 +1 @@
-465e99ed24478f3a2afe5ae1c4fdd7f4 v0.2.4.tar.gz
+47c9ea5fc8cf0c15cc6a15631bfbc770 v0.3.0.tar.gz
--- mpv-format-security.patch DELETED ---
10 years, 3 months
- 1
- 0
rpms/plus4emu/F-19 plus4emu-1.2.9.2-compat-lua.patch, NONE, 1.1 plus4emu.spec, 1.10, 1.11
by Andrea Musuruane
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(a)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(a)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(a)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
10 years, 3 months
- 1
- 0
rpms/plus4emu/F-20 plus4emu-1.2.9.2-compat-lua.patch, NONE, 1.1 plus4emu.spec, 1.10, 1.11
by Andrea Musuruane
Author: musuruan
Update of /cvs/nonfree/rpms/plus4emu/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11856
Modified Files:
plus4emu.spec
Added Files:
plus4emu-1.2.9.2-compat-lua.patch
Log Message:
* Tue Dec 31 2013 Andrea Musuruane <musuruan(a)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-20/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:38:55 -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(a)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(a)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
10 years, 3 months
- 1
- 0
rpms/plus4emu/devel plus4emu-1.2.9.2-compat-lua.patch, NONE, 1.1 plus4emu.spec, 1.10, 1.11
by Andrea Musuruane
Author: musuruan
Update of /cvs/nonfree/rpms/plus4emu/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11717
Modified Files:
plus4emu.spec
Added Files:
plus4emu-1.2.9.2-compat-lua.patch
Log Message:
* Tue Dec 31 2013 Andrea Musuruane <musuruan(a)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/devel/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:38:24 -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(a)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(a)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
10 years, 3 months
- 1
- 0