Author: musuruan Update of /cvs/nonfree/rpms/meka/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14389 Modified Files: .cvsignore meka.spec sources Added Files: meka-0.80-pointer.patch Log Message: * Sun Aug 18 2013 Andrea Musuruane <musuruan(a)gmail.com&gt; 0.80-0.3.20130725svn - Updated to a new upstream preview of version 0.80 - Fixed startup script - Used unversioned docdir meka-0.80-pointer.patch: app_cheatfinder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE meka-0.80-pointer.patch --- diff -dur meka-r435.orig/srcs/app_cheatfinder.c meka-r435/srcs/app_cheatfinder.c --- meka-r435.orig/srcs/app_cheatfinder.c 2013-07-23 23:46:54.177599000 +0200 +++ meka-r435/srcs/app_cheatfinder.c 2013-08-18 14:46:55.422806619 +0200 @@ -568,7 +568,7 @@ static void CheatFinder_CallbackComparer(t_widget* w) { t_cheat_finder* app = (t_cheat_finder*)w->box->user_data; - CheatFinder_ReduceMatches(app, (t_cheat_finder_comparer)(int)w->user_data); + CheatFinder_ReduceMatches(app, (t_cheat_finder_comparer)(intptr_t)w->user_data); } static void CheatFinder_CallbackReduce(t_widget* w) Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/meka/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 May 2012 16:58:14 -0000 1.3 +++ .cvsignore 23 Aug 2013 15:13:44 -0000 1.4 @@ -1 +1 @@ -meka-2012-05-03-srcs.zip +meka-2013-07-25-srcs.zip Index: meka.spec =================================================================== RCS file: /cvs/nonfree/rpms/meka/devel/meka.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- meka.spec 31 Dec 2012 13:18:28 -0000 1.4 +++ meka.spec 23 Aug 2013 15:13:44 -0000 1.5 @@ -1,21 +1,23 @@ -%define pkgdate 2012-05-03 -%define pkgversion %(echo %version|sed s/\\\\\.//g) +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} +%global pkgdate 2013-07-25 Name: meka Version: 0.80 -Release: 0.2.20120503svn%{?dist} +Release: 0.3.20130725svn%{?dist} Summary: Sega 8-bit machine emulator License: MEKA and non-commercial URL: http://www.smspower.org/meka/ # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: -# svn export -r 380 svn://svn.smspower.org/meka/branches/20110530-allegro5-sound meka-r380 -# cd meka-r380/ -# zip -ro ../meka-2012-05-03-srcs.zip * +# svn export -r 435 svn://svn.smspower.org/meka/trunk/meka meka-r435 +# cd meka-r435/ +# zip -ro ../meka-2013-07-25-srcs.zip * Source0: %{name}-%{pkgdate}-srcs.zip Source1: %{name}.sh Source2: %{name}.desktop +# Fix pointer cast +Patch0: %{name}-0.80-pointer.patch # This is package contains ix86 asm code ExclusiveArch: i686 x86_64 @@ -48,9 +50,7 @@ %prep %setup -q -c - -# Fix source files -mv srcs/z80marat/Z80DebugHelpers.cpp srcs/z80marat/Z80DebugHelpers.c +%patch0 -p1 # Remove boundled libs rm -rf libs @@ -64,6 +64,13 @@ mv $i.utf8 $i done +# Use unversioned docdir +sed -i 's!/usr/share/doc/$GAME-$VERSION!%{_pkgdocdir}!' %{SOURCE1} + +# Compile for unix +sed -i 's/SYSTEM = macosx/# SYSTEM = macosx/' srcs/Makefile +sed -i 's/# SYSTEM = unix/SYSTEM = unix/' srcs/Makefile + %build cd srcs @@ -127,6 +134,11 @@ %changelog +* Sun Aug 18 2013 Andrea Musuruane <musuruan(a)gmail.com&gt; 0.80-0.3.20130725svn +- Updated to a new upstream preview of version 0.80 +- Fixed startup script +- Used unversioned docdir + * Mon Dec 17 2012 Andrea Musuruane <musuruan(a)gmail.com&gt; 0.80-0.2.20120503svn - Fixed supported archs (BZ #2611) Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/meka/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 May 2012 16:58:15 -0000 1.3 +++ sources 23 Aug 2013 15:13:44 -0000 1.4 @@ -1 +1 @@ -09f0a5990b506cb0b045f3de751287ce meka-2012-05-03-srcs.zip +4e9951cec65777c96c3028388ed12b9d meka-2013-07-25-srcs.zip