Author: musuruan Update of /cvs/nonfree/rpms/meka/F-16 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15771 Modified Files: .cvsignore meka.sh meka.spec sources Removed Files: meka-0.72-buffer_overflow.patch meka-0.72-rpmopt.patch meka-0.73-execstack.patch meka-0.73-gcc45.patch meka-0.73-noseal.patch Log Message: * Sat May 05 2012 Andrea Musuruane <musuruan(a)gmail.com&gt; 0.80-0.1.20120503svn - Updated to an upstream preview of version 0.80 - Minor clean up for rpm >= 4.9 Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/meka/F-16/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 31 Dec 2010 18:34:01 -0000 1.2 +++ .cvsignore 5 May 2012 16:59:59 -0000 1.3 @@ -1 +1 @@ -meka-2010-05-30-srcs-v073.zip +meka-2012-05-03-srcs.zip Index: meka.sh =================================================================== RCS file: /cvs/nonfree/rpms/meka/F-16/meka.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- meka.sh 31 Dec 2010 18:34:01 -0000 1.1 +++ meka.sh 5 May 2012 17:00:00 -0000 1.2 @@ -1,6 +1,6 @@ #!/bin/sh GAME=meka -VERSION=0.73 +VERSION=0.80 GAME_LOCALDIR=$HOME/.$GAME GAME_DATADIR=/usr/share/$GAME GAME_EXECUTABLE=/usr/libexec/$GAME/$GAME @@ -13,17 +13,22 @@ ln -sf $GAME_EXECUTABLE $GAME # Create links to files which are not (usually) modified by users -for file in meka.{dat,msg,nam,pat,thm}; do +for file in meka.{blt,dat,msg,nam,pat,thm}; do ln -sf $GAME_DATADIR/$file $file done +# Create links to directory which are not (usually) modified by users +for dir in {datafiles,Themes}; do + ln -sf $GAME_DATADIR/$dir $dir +done + # Copy files which can be modified by users -for file in meka.{blt,inp}; do +for file in meka.inp; do test -e $file || cp -a $GAME_DATADIR/$file $file done # Create links to doc files -for file in {changes.txt,compat.txt,debugger.txt,mekanix.txt,meka.txt,multi.txt}; do +for file in {changes.txt,compat.txt,debugger.txt,meka.txt,multi.txt}; do ln -sf $GAME_DOCDIR/$file $file done Index: meka.spec =================================================================== RCS file: /cvs/nonfree/rpms/meka/F-16/meka.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- meka.spec 31 Dec 2010 18:34:01 -0000 1.1 +++ meka.spec 5 May 2012 17:00:00 -0000 1.2 @@ -1,39 +1,26 @@ -%define pkgdate 2010-05-30 +%define pkgdate 2012-05-03 %define pkgversion %(echo %version|sed s/\\\\\.//g) Name: meka -Version: 0.73 -Release: 4%{?dist} +Version: 0.80 +Release: 0.1.20120503svn%{?dist} Summary: Sega 8-bit machine emulator -Group: Applications/Emulators License: MEKA and non-commercial URL: http://www.smspower.org/meka/ -Source0: http://www.smspower.org/meka/releases/%{name}-%{pkgdate}-srcs-v%{pkgversi... +# 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 * +Source0: %{name}-%{pkgdate}-srcs.zip Source1: %{name}.sh Source2: %{name}.desktop -Patch0: %{name}-0.72-rpmopt.patch -Patch1: %{name}-0.72-buffer_overflow.patch -# http://www.smspower.org/forums/viewtopic.php?t=12699 -Patch2: %{name}-0.73-execstack.patch -# http://www.smspower.org/forums/viewtopic.php?t=10848 -# http://www.smspower.org/forums/viewtopic.php?t=12699 -Patch3: %{name}-0.73-noseal.patch -# http://www.smspower.org/forums/viewtopic.php?t=12699 -Patch4: %{name}-0.73-gcc45.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -# This is package contains ix86 asm code -ExclusiveArch: i686 - -BuildRequires: allegro-devel -BuildRequires: nasm +BuildRequires: allegro5-devel +BuildRequires: allegro5-addon-audio-devel +BuildRequires: allegro5-addon-image-devel BuildRequires: libpng-devel -BuildRequires: libXpm-devel -BuildRequires: libXxf86dga-devel -BuildRequires: libXxf86vm-devel -BuildRequires: libXext-devel BuildRequires: ImageMagick BuildRequires: desktop-file-utils Requires: hicolor-icon-theme @@ -59,23 +46,11 @@ %prep %setup -q -c -# Fix CFLAGS in Makefilie -%patch0 -p1 - -# Fix buffer overflows -%patch1 -p1 - -# Patch not to require an executable stack -%patch2 -p1 - -# Patch not to require libseal (audio is severly broken) -%patch3 -p1 - -# Patch to compile with gcc 4.5 -%patch4 -p1 +# Fix source files +mv srcs/z80marat/Z80DebugHelpers.cpp srcs/z80marat/Z80DebugHelpers.c -# Remove pre-built lib files -find -name '*.lib' -exec rm -f '{}' \; +# Remove boundled libs +rm -rf libs # Fix end-of-line-encoding sed -i 's/\r//' *.txt @@ -89,8 +64,9 @@ %build cd srcs +export CFLAGS="%{optflags}" # make doesn't compile with %%{?_smp_mflags} -make RPMFLAGS="%{optflags}" +make %install @@ -102,6 +78,10 @@ install -m 755 meka %{buildroot}/%{_libexecdir}/meka install -d %{buildroot}/%{_datadir}/meka install -m 644 meka.{blt,dat,inp,msg,nam,pat,thm} %{buildroot}/%{_datadir}/meka +install -d %{buildroot}/%{_datadir}/meka/datafiles +install -m 644 datafiles/* %{buildroot}/%{_datadir}/meka/datafiles +install -d %{buildroot}/%{_datadir}/meka/Themes +install -m 644 Themes/* %{buildroot}/%{_datadir}/meka/Themes # install desktop file mkdir -p %{buildroot}%{_datadir}/applications @@ -117,10 +97,6 @@ %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -%clean -rm -rf %{buildroot} - - %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -137,18 +113,24 @@ %files -%defattr(-,root,root,-) %{_bindir}/meka %{_libexecdir}/meka %{_datadir}/meka %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/16x16/apps/%{name}.png %{_datadir}/icons/hicolor/32x32/apps/%{name}.png -%doc changes.txt compat.txt debugger.txt history.txt mekanix.txt -%doc meka.txt multi.txt sources.txt tech.txt TODO.txt +%doc changes.txt compat.txt debugger.txt history.txt meka.txt multi.txt +%doc sources.txt tech.txt TODO.txt %changelog +* Sat May 05 2012 Andrea Musuruane <musuruan(a)gmail.com&gt; 0.80-0.1.20120503svn +- Updated to an upstream preview of version 0.80 +- Minor clean up for rpm >= 4.9 + +* Thu Feb 09 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.73-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sat Dec 11 2010 Andrea Musuruane <musuruan(a)gmail.com&gt; 0.73-4 - Fixed license @@ -167,4 +149,3 @@ * Thu Jul 30 2009 Andrea Musuruane <musuruan(a)gmail.com&gt; 0.73-0.1.20080619 - First release - Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/meka/F-16/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 31 Dec 2010 18:34:01 -0000 1.2 +++ sources 5 May 2012 17:00:00 -0000 1.3 @@ -1 +1 @@ -15d7201bb3de0d2e4c4683be57e614bc meka-2010-05-30-srcs-v073.zip +09f0a5990b506cb0b045f3de751287ce meka-2012-05-03-srcs.zip --- meka-0.72-buffer_overflow.patch DELETED --- --- meka-0.72-rpmopt.patch DELETED --- --- meka-0.73-execstack.patch DELETED --- --- meka-0.73-gcc45.patch DELETED --- --- meka-0.73-noseal.patch DELETED ---