rpms/miro/F-17 miro.spec,1.5,1.6
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/miro/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4479/F-17
Modified Files:
miro.spec
Log Message:
* Sat May 5 2012 Michel Salim <salimma(a)fedoraproject.org> - 5.0-2
- Only ship the platform-specific codegen binary
Index: miro.spec
===================================================================
RCS file: /cvs/free/rpms/miro/F-17/miro.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- miro.spec 5 May 2012 04:01:53 -0000 1.5
+++ miro.spec 6 May 2012 02:00:11 -0000 1.6
@@ -5,7 +5,7 @@
Name: miro
Version: 5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Internet TV Player
Group: Applications/Multimedia
@@ -25,6 +25,9 @@
# submitted: http://bugzilla.pculture.org/show_bug.cgi?id=18018
Patch2: miro-4.0.2.1-fix_screensaver_inhibit.patch
+# Miro is temporarily using pre-built codegen binaries
+# available only on these two platforms
+ExclusiveArch: i686 x86_64
BuildRequires: python-devel
BuildRequires: boost-devel
BuildRequires: desktop-file-utils
@@ -134,7 +137,15 @@
%files -f linux/miro.lang
-%{_bindir}/*
+%{_bindir}/miro*
+%ifarch x86_64
+%exclude %{_bindir}/codegen.Linux-i686
+%{_bindir}/codegen.Linux-x86_64
+%else
+%{_bindir}/codegen.Linux-i686
+%exclude %{_bindir}/codegen.Linux-x86_64
+%endif
+%{_bindir}/echoprint-codegen
%exclude %{_datadir}/miro/resources/testdata
%{_datadir}/miro
%{_datadir}/icons/hicolor/*/apps/*
@@ -148,6 +159,9 @@
%changelog
+* Sat May 5 2012 Michel Salim <salimma(a)fedoraproject.org> - 5.0-2
+- Only ship the platform-specific codegen binary
+
* Fri May 4 2012 Michel Salim <salimma(a)fedoraproject.org> - 5.0-1
- Update to 5.0
12 years, 1 month
rpms/miro/F-15 miro.spec,1.5,1.6
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/miro/F-15
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4479/F-15
Modified Files:
miro.spec
Log Message:
* Sat May 5 2012 Michel Salim <salimma(a)fedoraproject.org> - 5.0-2
- Only ship the platform-specific codegen binary
Index: miro.spec
===================================================================
RCS file: /cvs/free/rpms/miro/F-15/miro.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- miro.spec 5 May 2012 04:01:53 -0000 1.5
+++ miro.spec 6 May 2012 02:00:11 -0000 1.6
@@ -5,7 +5,7 @@
Name: miro
Version: 5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Internet TV Player
Group: Applications/Multimedia
@@ -25,6 +25,9 @@
# submitted: http://bugzilla.pculture.org/show_bug.cgi?id=18018
Patch2: miro-4.0.2.1-fix_screensaver_inhibit.patch
+# Miro is temporarily using pre-built codegen binaries
+# available only on these two platforms
+ExclusiveArch: i686 x86_64
BuildRequires: python-devel
BuildRequires: boost-devel
BuildRequires: desktop-file-utils
@@ -134,7 +137,15 @@
%files -f linux/miro.lang
-%{_bindir}/*
+%{_bindir}/miro*
+%ifarch x86_64
+%exclude %{_bindir}/codegen.Linux-i686
+%{_bindir}/codegen.Linux-x86_64
+%else
+%{_bindir}/codegen.Linux-i686
+%exclude %{_bindir}/codegen.Linux-x86_64
+%endif
+%{_bindir}/echoprint-codegen
%exclude %{_datadir}/miro/resources/testdata
%{_datadir}/miro
%{_datadir}/icons/hicolor/*/apps/*
@@ -148,6 +159,9 @@
%changelog
+* Sat May 5 2012 Michel Salim <salimma(a)fedoraproject.org> - 5.0-2
+- Only ship the platform-specific codegen binary
+
* Fri May 4 2012 Michel Salim <salimma(a)fedoraproject.org> - 5.0-1
- Update to 5.0
12 years, 1 month
rpms/miro/devel miro.spec,1.5,1.6
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/miro/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4479/devel
Modified Files:
miro.spec
Log Message:
* Sat May 5 2012 Michel Salim <salimma(a)fedoraproject.org> - 5.0-2
- Only ship the platform-specific codegen binary
Index: miro.spec
===================================================================
RCS file: /cvs/free/rpms/miro/devel/miro.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- miro.spec 5 May 2012 04:01:53 -0000 1.5
+++ miro.spec 6 May 2012 02:00:11 -0000 1.6
@@ -5,7 +5,7 @@
Name: miro
Version: 5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Internet TV Player
Group: Applications/Multimedia
@@ -25,6 +25,9 @@
# submitted: http://bugzilla.pculture.org/show_bug.cgi?id=18018
Patch2: miro-4.0.2.1-fix_screensaver_inhibit.patch
+# Miro is temporarily using pre-built codegen binaries
+# available only on these two platforms
+ExclusiveArch: i686 x86_64
BuildRequires: python-devel
BuildRequires: boost-devel
BuildRequires: desktop-file-utils
@@ -134,7 +137,15 @@
%files -f linux/miro.lang
-%{_bindir}/*
+%{_bindir}/miro*
+%ifarch x86_64
+%exclude %{_bindir}/codegen.Linux-i686
+%{_bindir}/codegen.Linux-x86_64
+%else
+%{_bindir}/codegen.Linux-i686
+%exclude %{_bindir}/codegen.Linux-x86_64
+%endif
+%{_bindir}/echoprint-codegen
%exclude %{_datadir}/miro/resources/testdata
%{_datadir}/miro
%{_datadir}/icons/hicolor/*/apps/*
@@ -148,6 +159,9 @@
%changelog
+* Sat May 5 2012 Michel Salim <salimma(a)fedoraproject.org> - 5.0-2
+- Only ship the platform-specific codegen binary
+
* Fri May 4 2012 Michel Salim <salimma(a)fedoraproject.org> - 5.0-1
- Update to 5.0
12 years, 1 month
rpms/meka/F-16 .cvsignore, 1.2, 1.3 meka.sh, 1.1, 1.2 meka.spec, 1.1, 1.2 sources, 1.2, 1.3 meka-0.72-buffer_overflow.patch, 1.1, NONE meka-0.72-rpmopt.patch, 1.1, NONE meka-0.73-execstack.patch, 1.1, NONE meka-0.73-gcc45.patch, 1.1, NONE meka-0.73-noseal.patch, 1.1, NONE
by Andrea Musuruane
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> 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> 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> - 0.73-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Sat Dec 11 2010 Andrea Musuruane <musuruan(a)gmail.com> 0.73-4
- Fixed license
@@ -167,4 +149,3 @@
* Thu Jul 30 2009 Andrea Musuruane <musuruan(a)gmail.com> 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 ---
12 years, 1 month
rpms/meka/F-17 .cvsignore, 1.2, 1.3 meka.sh, 1.1, 1.2 meka.spec, 1.2, 1.3 sources, 1.2, 1.3 meka-0.72-buffer_overflow.patch, 1.1, NONE meka-0.72-rpmopt.patch, 1.1, NONE meka-0.73-execstack.patch, 1.1, NONE meka-0.73-gcc45.patch, 1.1, NONE meka-0.73-noseal.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/nonfree/rpms/meka/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15614
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> 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-17/.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:15 -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-17/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 16:59:18 -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-17/meka.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- meka.spec 8 Feb 2012 23:44:31 -0000 1.2
+++ meka.spec 5 May 2012 16:59:18 -0000 1.3
@@ -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: 5%{?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,21 @@
%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> 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> - 0.73-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
@@ -170,4 +149,3 @@
* Thu Jul 30 2009 Andrea Musuruane <musuruan(a)gmail.com> 0.73-0.1.20080619
- First release
-
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/meka/F-17/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 16:59:18 -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 ---
12 years, 1 month
rpms/meka/devel .cvsignore, 1.2, 1.3 meka.sh, 1.1, 1.2 meka.spec, 1.2, 1.3 sources, 1.2, 1.3 meka-0.72-buffer_overflow.patch, 1.1, NONE meka-0.72-rpmopt.patch, 1.1, NONE meka-0.73-execstack.patch, 1.1, NONE meka-0.73-gcc45.patch, 1.1, NONE meka-0.73-noseal.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/nonfree/rpms/meka/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15409
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> 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/devel/.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:58:14 -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/devel/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 16:58:15 -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/devel/meka.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- meka.spec 8 Feb 2012 23:44:31 -0000 1.2
+++ meka.spec 5 May 2012 16:58:15 -0000 1.3
@@ -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: 5%{?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,21 @@
%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> 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> - 0.73-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
@@ -170,4 +149,3 @@
* Thu Jul 30 2009 Andrea Musuruane <musuruan(a)gmail.com> 0.73-0.1.20080619
- First release
-
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/meka/devel/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 16:58:15 -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 ---
12 years, 1 month
rpms/miro/F-16 miro.spec,1.4,1.5
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/miro/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27804/F-16
Modified Files:
miro.spec
Log Message:
Add missing BR on taglib-devel
Index: miro.spec
===================================================================
RCS file: /cvs/free/rpms/miro/F-16/miro.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- miro.spec 4 May 2012 15:32:40 -0000 1.4
+++ miro.spec 5 May 2012 04:01:53 -0000 1.5
@@ -26,19 +26,20 @@
Patch2: miro-4.0.2.1-fix_screensaver_inhibit.patch
BuildRequires: python-devel
-BuildRequires: boost-devel
+BuildRequires: boost-devel
BuildRequires: desktop-file-utils
BuildRequires: ffmpeg-devel
BuildRequires: gettext
BuildRequires: Pyrex
BuildRequires: pygtk2-devel
+BuildRequires: taglib-devel
BuildRequires: webkitgtk-devel
# for testing
%if %{with check}
BuildRequires: dbus-x11
BuildRequires: dbus-python
-BuildRequires: ffmpeg
+BuildRequires: ffmpeg
BuildRequires: GConf2
BuildRequires: gnome-python2-gconf
BuildRequires: gstreamer-plugins-good
@@ -53,7 +54,7 @@
Requires: avahi-compat-libdns_sd
Requires: dbus-python
Requires: dbus-x11
-Requires: ffmpeg
+Requires: ffmpeg
#Requires: ffmpeg2theora
Requires: GConf2
Requires: gnome-python2-gconf
12 years, 2 months
rpms/miro/F-17 miro.spec,1.4,1.5
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/miro/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27804/F-17
Modified Files:
miro.spec
Log Message:
Add missing BR on taglib-devel
Index: miro.spec
===================================================================
RCS file: /cvs/free/rpms/miro/F-17/miro.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- miro.spec 4 May 2012 15:32:42 -0000 1.4
+++ miro.spec 5 May 2012 04:01:53 -0000 1.5
@@ -26,19 +26,20 @@
Patch2: miro-4.0.2.1-fix_screensaver_inhibit.patch
BuildRequires: python-devel
-BuildRequires: boost-devel
+BuildRequires: boost-devel
BuildRequires: desktop-file-utils
BuildRequires: ffmpeg-devel
BuildRequires: gettext
BuildRequires: Pyrex
BuildRequires: pygtk2-devel
+BuildRequires: taglib-devel
BuildRequires: webkitgtk-devel
# for testing
%if %{with check}
BuildRequires: dbus-x11
BuildRequires: dbus-python
-BuildRequires: ffmpeg
+BuildRequires: ffmpeg
BuildRequires: GConf2
BuildRequires: gnome-python2-gconf
BuildRequires: gstreamer-plugins-good
@@ -53,7 +54,7 @@
Requires: avahi-compat-libdns_sd
Requires: dbus-python
Requires: dbus-x11
-Requires: ffmpeg
+Requires: ffmpeg
#Requires: ffmpeg2theora
Requires: GConf2
Requires: gnome-python2-gconf
12 years, 2 months
rpms/miro/F-15 miro.spec,1.4,1.5
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/miro/F-15
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27804/F-15
Modified Files:
miro.spec
Log Message:
Add missing BR on taglib-devel
Index: miro.spec
===================================================================
RCS file: /cvs/free/rpms/miro/F-15/miro.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- miro.spec 4 May 2012 15:32:38 -0000 1.4
+++ miro.spec 5 May 2012 04:01:53 -0000 1.5
@@ -26,19 +26,20 @@
Patch2: miro-4.0.2.1-fix_screensaver_inhibit.patch
BuildRequires: python-devel
-BuildRequires: boost-devel
+BuildRequires: boost-devel
BuildRequires: desktop-file-utils
BuildRequires: ffmpeg-devel
BuildRequires: gettext
BuildRequires: Pyrex
BuildRequires: pygtk2-devel
+BuildRequires: taglib-devel
BuildRequires: webkitgtk-devel
# for testing
%if %{with check}
BuildRequires: dbus-x11
BuildRequires: dbus-python
-BuildRequires: ffmpeg
+BuildRequires: ffmpeg
BuildRequires: GConf2
BuildRequires: gnome-python2-gconf
BuildRequires: gstreamer-plugins-good
@@ -53,7 +54,7 @@
Requires: avahi-compat-libdns_sd
Requires: dbus-python
Requires: dbus-x11
-Requires: ffmpeg
+Requires: ffmpeg
#Requires: ffmpeg2theora
Requires: GConf2
Requires: gnome-python2-gconf
12 years, 2 months
rpms/miro/devel miro.spec,1.4,1.5
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/miro/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27804/devel
Modified Files:
miro.spec
Log Message:
Add missing BR on taglib-devel
Index: miro.spec
===================================================================
RCS file: /cvs/free/rpms/miro/devel/miro.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- miro.spec 4 May 2012 15:32:43 -0000 1.4
+++ miro.spec 5 May 2012 04:01:53 -0000 1.5
@@ -26,19 +26,20 @@
Patch2: miro-4.0.2.1-fix_screensaver_inhibit.patch
BuildRequires: python-devel
-BuildRequires: boost-devel
+BuildRequires: boost-devel
BuildRequires: desktop-file-utils
BuildRequires: ffmpeg-devel
BuildRequires: gettext
BuildRequires: Pyrex
BuildRequires: pygtk2-devel
+BuildRequires: taglib-devel
BuildRequires: webkitgtk-devel
# for testing
%if %{with check}
BuildRequires: dbus-x11
BuildRequires: dbus-python
-BuildRequires: ffmpeg
+BuildRequires: ffmpeg
BuildRequires: GConf2
BuildRequires: gnome-python2-gconf
BuildRequires: gstreamer-plugins-good
@@ -53,7 +54,7 @@
Requires: avahi-compat-libdns_sd
Requires: dbus-python
Requires: dbus-x11
-Requires: ffmpeg
+Requires: ffmpeg
#Requires: ffmpeg2theora
Requires: GConf2
Requires: gnome-python2-gconf
12 years, 2 months