rpms/xbmc/F-14 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xbmc-generate-tarball-xz.sh, 1.8, 1.9 xbmc.spec, 1.23, 1.24
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/xbmc/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10945
Modified Files:
.cvsignore sources xbmc-generate-tarball-xz.sh xbmc.spec
Log Message:
- Update to 10.1
- Add support for using system python-imaging and pysqlite modules, thanks to Pierre
Ossman for patch (#1575)
- Drop most references to SVNVERSION, upstream now uses git
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-14/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 24 Dec 2010 03:23:02 -0000 1.9
+++ .cvsignore 30 Mar 2011 06:12:59 -0000 1.10
@@ -1 +1 @@
-xbmc-10.0-Dharma-patched.tar.xz
+xbmc-10.1-patched.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-14/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 24 Dec 2010 03:23:02 -0000 1.9
+++ sources 30 Mar 2011 06:12:59 -0000 1.10
@@ -1 +1 @@
-b3f969d96f4f598352c19e599d3534da xbmc-10.0-Dharma-patched.tar.xz
+48b245821464216f154aef16b88651f5 xbmc-10.1-patched.tar.xz
Index: xbmc-generate-tarball-xz.sh
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-14/xbmc-generate-tarball-xz.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xbmc-generate-tarball-xz.sh 24 Dec 2010 03:23:02 -0000 1.8
+++ xbmc-generate-tarball-xz.sh 30 Mar 2011 06:12:59 -0000 1.9
@@ -1,20 +1,18 @@
#!/bin/sh
-MAJORVERSION=10.0
+MAJORVERSION=10.1
-# pull from Dharma branch
-SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma
+# FIXME: need to update to use git
+#SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma
# uncomment this to switch to trunk
#SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk
# use SVN version number passed from script, or otherwise use default
SVNVERSION=${1-35567}
-# uncomment following if you want to always pull from tip of branch
-# SVNVERSION=$(svn info $SVNURL |grep "Revision:"|cut -d' ' -f2)
-VERSION=$MAJORVERSION-Dharma
-# SVN snapshot
+VERSION=$MAJORVERSION
+# git snapshot
#VERSION=$MAJORVERSION-$SVNVERSION
# pre-release
#VERSION=Dharma_rc2
@@ -22,19 +20,14 @@
# remove existing checkout
rm -r xbmc-$VERSION
-#svn export -r $SVNVERSION $SVNURL xbmc-$VERSION
-
# don't need to extra tarball, already expanded
# comment out with tarball
tar -xzvf xbmc-$VERSION.tar.gz
-# rename tarball directory
-mv -i $VERSION xbmc-$VERSION
cd xbmc-$VERSION
# remove bundled libraries (including zlib and OSX), saves space and forces using external versions
# also remove legally problematic libGoAhead library
-#for i in libass libcdio libCDRip libcurl libenca libfribidi liblzo libmms libpcre libsamplerate sqLite/sqlite libPython/Python cximage-6.0/zlib libid3tag/zlib zlib libSDL-OSX boost libportaudio libglew libGoAhead libhdhomerun
for i in liblzo libmms libsamplerate sqLite/sqlite libPython/Python cximage-6.0/zlib libid3tag/zlib zlib boost libhdhomerun
do
rm -r xbmc/lib/$i
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-14/xbmc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xbmc.spec 24 Dec 2010 03:23:02 -0000 1.23
+++ xbmc.spec 30 Mar 2011 06:12:59 -0000 1.24
@@ -1,13 +1,10 @@
-%global SVNVERSION 35648
#global PRERELEASE Dharma_rc2
-%global DIRVERSION %{version}-Dharma
-# use below for SVN snapshot
-#global DIRVERSION %{version}-%{SVNVERSION}
+%global DIRVERSION %{version}
# use below for pre-release
#global DIRVERSION %{PRERELEASE}
Name: xbmc
-Version: 10.0
+Version: 10.1
Release: 1%{?dist}
URL: http://www.xbmc.org/
@@ -138,6 +135,13 @@
Requires: librtmp
Requires: libbluray
+# These are just symlinked to, but needed both at build-time
+# and for installation
+BuildRequires: python-imaging
+Requires: python-imaging
+BuildRequires: python-sqlite2
+Requires: python-sqlite2
+
%description
XBMC media center is a free cross-platform media-player jukebox and
entertainment hub. XBMC can play a spectrum of of multimedia formats,
@@ -174,7 +178,6 @@
--disable-libdts --disable-liba52 \
--disable-dvdcss \
--disable-optimizations --disable-debug \
-SVN_REV=%{SVNVERSION} \
CPPFLAGS="-I/usr/include/ffmpeg" \
CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \
CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \
@@ -199,6 +202,14 @@
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/xbmc.desktop
+# Normally we are expected to build these manually. But since we are using
+# the system Python interpreter, we also want to use the system libraries
+install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pil/lib
+ln -s %{python_sitearch}/PIL $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pil/lib/PIL
+install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib
+ln -s %{python_sitearch}/pysqlite2 $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib/pysqlite2
+
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -214,6 +225,15 @@
%{_datadir}/icons/hicolor/*/*/*.png
%changelog
+* Tue Mar 29 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.1-1
+- Update to 10.1
+- Add support for using system python-imaging and pysqlite modules, thanks to Pierre
+ Ossman for patch (#1575)
+- Drop most references to SVNVERSION, upstream now uses git
+
+* Sun Mar 27 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 10.0-2
+- Rebuild for libmysqlclient
+
* Thu Dec 23 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.0-1
- Update to 10.0 (Dharma final)
13 years, 8 months
rpms/xbmc/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xbmc-generate-tarball-xz.sh, 1.8, 1.9 xbmc.spec, 1.24, 1.25
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/xbmc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7792
Modified Files:
.cvsignore sources xbmc-generate-tarball-xz.sh xbmc.spec
Log Message:
Update to 10.1
- Add support for using system python-imaging and pysqlite modules, thanks to Pierre
Ossman for patch (#1575)
- Drop most references to SVNVERSION, upstream now uses git
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 23 Dec 2010 22:52:06 -0000 1.9
+++ .cvsignore 30 Mar 2011 05:31:36 -0000 1.10
@@ -1 +1 @@
-xbmc-10.0-Dharma-patched.tar.xz
+xbmc-10.1-patched.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 23 Dec 2010 22:52:06 -0000 1.9
+++ sources 30 Mar 2011 05:31:36 -0000 1.10
@@ -1 +1 @@
-b3f969d96f4f598352c19e599d3534da xbmc-10.0-Dharma-patched.tar.xz
+48b245821464216f154aef16b88651f5 xbmc-10.1-patched.tar.xz
Index: xbmc-generate-tarball-xz.sh
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc-generate-tarball-xz.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xbmc-generate-tarball-xz.sh 23 Dec 2010 22:52:06 -0000 1.8
+++ xbmc-generate-tarball-xz.sh 30 Mar 2011 05:31:36 -0000 1.9
@@ -1,20 +1,18 @@
#!/bin/sh
-MAJORVERSION=10.0
+MAJORVERSION=10.1
-# pull from Dharma branch
-SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma
+# FIXME: need to update to use git
+#SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma
# uncomment this to switch to trunk
#SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk
# use SVN version number passed from script, or otherwise use default
SVNVERSION=${1-35567}
-# uncomment following if you want to always pull from tip of branch
-# SVNVERSION=$(svn info $SVNURL |grep "Revision:"|cut -d' ' -f2)
-VERSION=$MAJORVERSION-Dharma
-# SVN snapshot
+VERSION=$MAJORVERSION
+# git snapshot
#VERSION=$MAJORVERSION-$SVNVERSION
# pre-release
#VERSION=Dharma_rc2
@@ -22,19 +20,14 @@
# remove existing checkout
rm -r xbmc-$VERSION
-#svn export -r $SVNVERSION $SVNURL xbmc-$VERSION
-
# don't need to extra tarball, already expanded
# comment out with tarball
tar -xzvf xbmc-$VERSION.tar.gz
-# rename tarball directory
-mv -i $VERSION xbmc-$VERSION
cd xbmc-$VERSION
# remove bundled libraries (including zlib and OSX), saves space and forces using external versions
# also remove legally problematic libGoAhead library
-#for i in libass libcdio libCDRip libcurl libenca libfribidi liblzo libmms libpcre libsamplerate sqLite/sqlite libPython/Python cximage-6.0/zlib libid3tag/zlib zlib libSDL-OSX boost libportaudio libglew libGoAhead libhdhomerun
for i in liblzo libmms libsamplerate sqLite/sqlite libPython/Python cximage-6.0/zlib libid3tag/zlib zlib boost libhdhomerun
do
rm -r xbmc/lib/$i
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xbmc.spec 27 Mar 2011 16:59:32 -0000 1.24
+++ xbmc.spec 30 Mar 2011 05:31:36 -0000 1.25
@@ -1,14 +1,11 @@
-%global SVNVERSION 35648
#global PRERELEASE Dharma_rc2
-%global DIRVERSION %{version}-Dharma
-# use below for SVN snapshot
-#global DIRVERSION %{version}-%{SVNVERSION}
+%global DIRVERSION %{version}
# use below for pre-release
#global DIRVERSION %{PRERELEASE}
Name: xbmc
-Version: 10.0
-Release: 2%{?dist}
+Version: 10.1
+Release: 1%{?dist}
URL: http://www.xbmc.org/
Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -138,6 +135,13 @@
Requires: librtmp
Requires: libbluray
+# These are just symlinked to, but needed both at build-time
+# and for installation
+BuildRequires: python-imaging
+Requires: python-imaging
+BuildRequires: python-sqlite2
+Requires: python-sqlite2
+
%description
XBMC media center is a free cross-platform media-player jukebox and
entertainment hub. XBMC can play a spectrum of of multimedia formats,
@@ -174,7 +178,6 @@
--disable-libdts --disable-liba52 \
--disable-dvdcss \
--disable-optimizations --disable-debug \
-SVN_REV=%{SVNVERSION} \
CPPFLAGS="-I/usr/include/ffmpeg" \
CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \
CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \
@@ -199,6 +202,14 @@
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/xbmc.desktop
+# Normally we are expected to build these manually. But since we are using
+# the system Python interpreter, we also want to use the system libraries
+install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pil/lib
+ln -s %{python_sitearch}/PIL $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pil/lib/PIL
+install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib
+ln -s %{python_sitearch}/pysqlite2 $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib/pysqlite2
+
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -214,6 +225,12 @@
%{_datadir}/icons/hicolor/*/*/*.png
%changelog
+* Tue Mar 29 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.1-1
+- Update to 10.1
+- Add support for using system python-imaging and pysqlite modules, thanks to Pierre
+ Ossman for patch (#1575)
+- Drop most references to SVNVERSION, upstream now uses git
+
* Sun Mar 27 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 10.0-2
- Rebuild for libmysqlclient
13 years, 8 months
rpms/mplayer/devel .cvsignore, 1.21, 1.22 mplayer-ffmpeg.patch, 1.1, 1.2 mplayer.spec, 1.35, 1.36 sources, 1.22, 1.23
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27932
Modified Files:
.cvsignore mplayer-ffmpeg.patch mplayer.spec sources
Log Message:
* Sun Mar 27 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.122.20110227svn
- 20110227 snapshot
- rebuilt for new ffmpeg and x264
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 10 Jan 2011 18:48:43 -0000 1.21
+++ .cvsignore 27 Mar 2011 21:52:45 -0000 1.22
@@ -1,2 +1,3 @@
Blue-1.7.tar.bz2
mplayer-export-2011-01-10.tar.bz2
+mplayer-export-2011-02-27.tar.bz2
mplayer-ffmpeg.patch:
Makefile | 2
configure | 5 +-
ffmpeg/libavformat/riff.h | 41 ++++++++++++++++++
ffmpeg/libavutil/aes.h | 47 +++++++++++++++++++++
ffmpeg/libavutil/sha.h | 56 +++++++++++++++++++++++++
ffmpeg/libavutil/x86_cpu.h | 98 +++++++++++++++++++++++++++++++++++++++++++++
libmpcodecs/vf_pp.c | 2
7 files changed, 247 insertions(+), 4 deletions(-)
Index: mplayer-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-ffmpeg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mplayer-ffmpeg.patch 10 Jan 2011 18:48:43 -0000 1.1
+++ mplayer-ffmpeg.patch 27 Mar 2011 21:52:45 -0000 1.2
@@ -1,28 +1,28 @@
-diff -up mplayer-export-2011-01-10/configure.ffmpeg mplayer-export-2011-01-10/configure
---- mplayer-export-2011-01-10/configure.ffmpeg 2011-01-10 19:04:02.000000000 +0100
-+++ mplayer-export-2011-01-10/configure 2011-01-10 19:05:23.000000000 +0100
-@@ -6866,7 +6866,8 @@ elif test "$ffmpeg_so" = auto ; then
- inc_ffmpeg=$($_pkg_config --cflags libpostproc libswscale libavformat libavcodec libavutil libavcore)
- _ld_tmp=$($_pkg_config --libs libpostproc libswscale libavformat libavcodec libavutil libavcore)
- header_check libavcore/avcore.h $inc_ffmpeg $_ld_tmp &&
+diff -up mplayer-export-2011-02-27/configure.ffmpeg mplayer-export-2011-02-27/configure
+--- mplayer-export-2011-02-27/configure.ffmpeg 2011-03-23 19:39:17.000000000 +0100
++++ mplayer-export-2011-02-27/configure 2011-03-23 19:42:40.000000000 +0100
+@@ -6887,7 +6887,8 @@ elif test "$ffmpeg_so" = auto ; then
+ inc_ffmpeg=$($_pkg_config --cflags libpostproc libswscale libavformat libavcodec libavutil)
+ _ld_tmp=$($_pkg_config --libs libpostproc libswscale libavformat libavcodec libavutil)
+ header_check libavutil/avutil.h $inc_ffmpeg $_ld_tmp &&
- extra_ldflags="$extra_ldflags $_ld_tmp" && ffmpeg_so=yes && ffmpeg=yes
+ extra_ldflags="$extra_ldflags $_ld_tmp" && ffmpeg_so=yes && ffmpeg=yes &&
+ extra_cflags="$extra_cflags $inc_ffmpeg"
- elif header_check libavcore/avcore.h -lpostproc -lswscale -lavformat -lavcodec -lavutil -lavcore $_ld_lm ; then
- extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec -lavutil -lavcore"
+ elif header_check libavutil/avutil.h -lpostproc -lswscale -lavformat -lavcodec -lavutil $_ld_lm ; then
+ extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec -lavutil"
ffmpeg_so=yes
-@@ -7553,7 +7554,7 @@ if test "$_gui" = yes ; then
+@@ -7574,7 +7575,7 @@ if test "$_gui" = yes ; then
# Required libraries
if test "$ffmpeg" != yes ||
- ! echo $libavdecoders | grep -q PNG_DECODER ; then
-+ ! objdump -T $_libdir/libavcodec.so | grep -q png_decoder ; then
++ ! objdump -T $_libdir/libavcodec.so | grep -q ff_png ; then
die "The GUI requires libavcodec with PNG support (needs zlib)."
fi
test "$_freetype" = no && test "$_bitmap_font" = no &&
-diff -up mplayer-export-2011-01-10/ffmpeg/libavformat/riff.h.ffmpeg mplayer-export-2011-01-10/ffmpeg/libavformat/riff.h
---- mplayer-export-2011-01-10/ffmpeg/libavformat/riff.h.ffmpeg 2011-01-10 19:04:02.000000000 +0100
-+++ mplayer-export-2011-01-10/ffmpeg/libavformat/riff.h 2011-01-10 19:05:57.000000000 +0100
+diff -up mplayer-export-2011-02-27/ffmpeg/libavformat/riff.h.ffmpeg mplayer-export-2011-02-27/ffmpeg/libavformat/riff.h
+--- mplayer-export-2011-02-27/ffmpeg/libavformat/riff.h.ffmpeg 2011-03-23 19:39:17.000000000 +0100
++++ mplayer-export-2011-02-27/ffmpeg/libavformat/riff.h 2011-03-23 19:39:17.000000000 +0100
@@ -0,0 +1,41 @@
+/*
+ * RIFF codec tags
@@ -65,9 +65,9 @@
+extern const AVCodecTag ff_codec_wav_tags[];
+
+#endif /* AVFORMAT_RIFF_H */
-diff -up mplayer-export-2011-01-10/ffmpeg/libavutil/aes.h.ffmpeg mplayer-export-2011-01-10/ffmpeg/libavutil/aes.h
---- mplayer-export-2011-01-10/ffmpeg/libavutil/aes.h.ffmpeg 2011-01-10 19:04:02.000000000 +0100
-+++ mplayer-export-2011-01-10/ffmpeg/libavutil/aes.h 2011-01-10 19:04:02.000000000 +0100
+diff -up mplayer-export-2011-02-27/ffmpeg/libavutil/aes.h.ffmpeg mplayer-export-2011-02-27/ffmpeg/libavutil/aes.h
+--- mplayer-export-2011-02-27/ffmpeg/libavutil/aes.h.ffmpeg 2011-03-23 19:39:17.000000000 +0100
++++ mplayer-export-2011-02-27/ffmpeg/libavutil/aes.h 2011-03-23 19:39:17.000000000 +0100
@@ -0,0 +1,47 @@
+/*
+ * copyright (c) 2007 Michael Niedermayer <michaelni(a)gmx.at>
@@ -116,9 +116,9 @@
+void av_aes_crypt(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
+
+#endif /* AVUTIL_AES_H */
-diff -up mplayer-export-2011-01-10/ffmpeg/libavutil/sha.h.ffmpeg mplayer-export-2011-01-10/ffmpeg/libavutil/sha.h
---- mplayer-export-2011-01-10/ffmpeg/libavutil/sha.h.ffmpeg 2011-01-10 19:04:02.000000000 +0100
-+++ mplayer-export-2011-01-10/ffmpeg/libavutil/sha.h 2011-01-10 19:04:02.000000000 +0100
+diff -up mplayer-export-2011-02-27/ffmpeg/libavutil/sha.h.ffmpeg mplayer-export-2011-02-27/ffmpeg/libavutil/sha.h
+--- mplayer-export-2011-02-27/ffmpeg/libavutil/sha.h.ffmpeg 2011-03-23 19:39:17.000000000 +0100
++++ mplayer-export-2011-02-27/ffmpeg/libavutil/sha.h 2011-03-23 19:39:17.000000000 +0100
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2007 Michael Niedermayer <michaelni(a)gmx.at>
@@ -176,9 +176,9 @@
+void av_sha_final(struct AVSHA* context, uint8_t *digest);
+
+#endif /* AVUTIL_SHA_H */
-diff -up mplayer-export-2011-01-10/ffmpeg/libavutil/x86_cpu.h.ffmpeg mplayer-export-2011-01-10/ffmpeg/libavutil/x86_cpu.h
---- mplayer-export-2011-01-10/ffmpeg/libavutil/x86_cpu.h.ffmpeg 2011-01-10 19:04:02.000000000 +0100
-+++ mplayer-export-2011-01-10/ffmpeg/libavutil/x86_cpu.h 2011-01-10 19:04:02.000000000 +0100
+diff -up mplayer-export-2011-02-27/ffmpeg/libavutil/x86_cpu.h.ffmpeg mplayer-export-2011-02-27/ffmpeg/libavutil/x86_cpu.h
+--- mplayer-export-2011-02-27/ffmpeg/libavutil/x86_cpu.h.ffmpeg 2011-03-23 19:39:17.000000000 +0100
++++ mplayer-export-2011-02-27/ffmpeg/libavutil/x86_cpu.h 2011-03-23 19:39:17.000000000 +0100
@@ -0,0 +1,98 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
@@ -278,9 +278,9 @@
+#endif
+
+#endif /* AVUTIL_X86_CPU_H */
-diff -up mplayer-export-2011-01-10/libmpcodecs/vf_pp.c.ffmpeg mplayer-export-2011-01-10/libmpcodecs/vf_pp.c
---- mplayer-export-2011-01-10/libmpcodecs/vf_pp.c.ffmpeg 2010-09-13 20:19:25.000000000 +0200
-+++ mplayer-export-2011-01-10/libmpcodecs/vf_pp.c 2011-01-10 19:04:02.000000000 +0100
+diff -up mplayer-export-2011-02-27/libmpcodecs/vf_pp.c.ffmpeg mplayer-export-2011-02-27/libmpcodecs/vf_pp.c
+--- mplayer-export-2011-02-27/libmpcodecs/vf_pp.c.ffmpeg 2011-02-04 11:01:46.000000000 +0100
++++ mplayer-export-2011-02-27/libmpcodecs/vf_pp.c 2011-03-23 19:39:17.000000000 +0100
@@ -34,10 +34,10 @@
#include "img_format.h"
#include "mp_image.h"
@@ -293,10 +293,10 @@
#define EMU_OLD
#include "libpostproc/postprocess_internal.h"
#endif
-diff -up mplayer-export-2011-01-10/Makefile.ffmpeg mplayer-export-2011-01-10/Makefile
---- mplayer-export-2011-01-10/Makefile.ffmpeg 2011-01-10 19:04:02.000000000 +0100
-+++ mplayer-export-2011-01-10/Makefile 2011-01-10 19:04:02.000000000 +0100
-@@ -810,7 +810,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
+diff -up mplayer-export-2011-02-27/Makefile.ffmpeg mplayer-export-2011-02-27/Makefile
+--- mplayer-export-2011-02-27/Makefile.ffmpeg 2011-03-23 19:39:17.000000000 +0100
++++ mplayer-export-2011-02-27/Makefile 2011-03-23 19:39:17.000000000 +0100
+@@ -808,7 +808,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
$(CC) -o $@ $^ $(EXTRALIBS)
codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mplayer.spec 27 Mar 2011 16:58:17 -0000 1.35
+++ mplayer.spec 27 Mar 2011 21:52:45 -0000 1.36
@@ -1,12 +1,12 @@
%define codecdir %{_libdir}/codecs
-%define pre 20110110svn
+%define pre 20110227svn
%define svn 1
-%define svnbuild 2011-01-10
+%define svnbuild 2011-02-27
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.0
-Release: 0.121.%{pre}%{?dist}
+Release: 0.122.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -399,6 +399,10 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Sun Mar 27 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.122.20110227svn
+- 20110227 snapshot
+- rebuilt for new ffmpeg and x264
+
* Sun Mar 27 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-0.121.20110110svn
- Rebuild for x264
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 10 Jan 2011 18:48:43 -0000 1.22
+++ sources 27 Mar 2011 21:52:45 -0000 1.23
@@ -1,2 +1,3 @@
e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
d1c8316979ec850a8b345a08775739e7 mplayer-export-2011-01-10.tar.bz2
+98d92317fbadd65a404c1a1524fa6ad3 mplayer-export-2011-02-27.tar.bz2
13 years, 8 months
rpms/gstreamer-plugins-bad/F-14 gstreamer-plugins-bad.spec, 1.39, 1.40
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-plugins-bad/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6411
Modified Files:
gstreamer-plugins-bad.spec
Log Message:
* Sun Mar 27 2011 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.20-3
- Enable rtmp plugin (rf#1651)
Index: gstreamer-plugins-bad.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-bad/F-14/gstreamer-plugins-bad.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gstreamer-plugins-bad.spec 27 Mar 2011 18:38:34 -0000 1.39
+++ gstreamer-plugins-bad.spec 27 Mar 2011 18:39:11 -0000 1.40
@@ -15,7 +15,7 @@
Summary: GStreamer streaming media framework "bad" plug-ins
Name: gstreamer-plugins-bad
Version: 0.10.20
-Release: 3%{?dist}
+Release: 3%{?dist}.1
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
13 years, 8 months
rpms/gstreamer-plugins-bad/F-14 gstreamer-plugins-bad.spec, 1.38, 1.39
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-plugins-bad/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6321
Modified Files:
gstreamer-plugins-bad.spec
Log Message:
* Sun Mar 27 2011 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.20-3
- Enable rtmp plugin (rf#1651)
Index: gstreamer-plugins-bad.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-bad/F-14/gstreamer-plugins-bad.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gstreamer-plugins-bad.spec 14 Oct 2010 22:03:31 -0000 1.38
+++ gstreamer-plugins-bad.spec 27 Mar 2011 18:38:34 -0000 1.39
@@ -10,12 +10,12 @@
%else
%define gstdirs gst/asfmux gst/dvdspu gst/mpegpsmux gst/mpegtsmux gst/qtmux gst/siren
%endif
-%define extdirs ext/dts ext/faad ext/libmms ext/mimic ext/mpeg2enc ext/mplex ext/xvid
+%define extdirs ext/dts ext/faad ext/libmms ext/mimic ext/mpeg2enc ext/mplex ext/rtmp ext/xvid
Summary: GStreamer streaming media framework "bad" plug-ins
Name: gstreamer-plugins-bad
Version: 0.10.20
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -40,6 +40,7 @@
BuildRequires: mjpegtools-devel
BuildRequires: twolame-devel
BuildRequires: libmimic-devel
+BuildRequires: librtmp-devel
%description
GStreamer is a streaming media framework, based on graphs of elements which
@@ -108,10 +109,14 @@
%{_libdir}/gstreamer-%{majorminor}/libgstmimic.so
%{_libdir}/gstreamer-%{majorminor}/libgstmpeg2enc.so
%{_libdir}/gstreamer-%{majorminor}/libgstmplex.so
+%{_libdir}/gstreamer-%{majorminor}/libgstrtmp.so
%{_libdir}/gstreamer-%{majorminor}/libgstxvid.so
%changelog
+* Sun Mar 27 2011 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.20-3
+- Enable rtmp plugin (rf#1651)
+
* Fri Oct 15 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.20-2
- Rebuilt for gcc bug
13 years, 8 months
rpms/avidemux/devel avidemux.spec,1.35,1.36
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26761
Modified Files:
avidemux.spec
Log Message:
Rebuild
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- avidemux.spec 20 Jul 2010 19:27:17 -0000 1.35
+++ avidemux.spec 27 Mar 2011 17:00:25 -0000 1.36
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.3
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -263,6 +263,9 @@
%{_includedir}/ADM_coreConfig.h
%changelog
+* Sun Mar 27 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.5.3-5
+- Rebuild for x264
+
* Tue Jul 20 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.3-4
- Rebuild for new x264
13 years, 8 months
rpms/xbmc/devel xbmc.spec,1.23,1.24
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xbmc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26603
Modified Files:
xbmc.spec
Log Message:
Rebuild
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xbmc.spec 23 Dec 2010 22:52:06 -0000 1.23
+++ xbmc.spec 27 Mar 2011 16:59:32 -0000 1.24
@@ -8,7 +8,7 @@
Name: xbmc
Version: 10.0
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.xbmc.org/
Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -214,6 +214,9 @@
%{_datadir}/icons/hicolor/*/*/*.png
%changelog
+* Sun Mar 27 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 10.0-2
+- Rebuild for libmysqlclient
+
* Thu Dec 23 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.0-1
- Update to 10.0 (Dharma final)
13 years, 8 months
rpms/mplayer/devel mplayer.spec,1.34,1.35
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26445
Modified Files:
mplayer.spec
Log Message:
Rebuild
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- mplayer.spec 10 Jan 2011 18:48:43 -0000 1.34
+++ mplayer.spec 27 Mar 2011 16:58:17 -0000 1.35
@@ -6,7 +6,7 @@
Name: mplayer
Version: 1.0
-Release: 0.120.%{pre}%{?dist}
+Release: 0.121.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -399,6 +399,9 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Sun Mar 27 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-0.121.20110110svn
+- Rebuild for x264
+
* Mon Jan 10 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.120.20110110svn
- 20110110 snapshot
- enabled BluRay, bzip2, libgsm, rtmp support
13 years, 8 months
rpms/mame/F-13 .cvsignore, 1.21, 1.22 mame.spec, 1.23, 1.24 sources, 1.21, 1.22
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29167
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Fri Mar 25 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141u4-1
- Updated to 0.141u4
- Re-enabled ldplayer
- Added support for hash files
- Sorted the %install section alphabetically
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-13/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 28 Feb 2011 21:32:58 -0000 1.21
+++ .cvsignore 26 Mar 2011 09:10:50 -0000 1.22
@@ -2,3 +2,4 @@
0141u1_diff.zip
0141u2_diff.zip
0141u3_diff.zip
+0141u4_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-13/mame.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mame.spec 28 Feb 2011 21:54:09 -0000 1.23
+++ mame.spec 26 Mar 2011 09:10:51 -0000 1.24
@@ -1,11 +1,11 @@
# ldplayer can be disabled by --without ldplayer or by changing to %bcond_with
# if it does not build. The debug build is disabled by default, please use
# --with debug to override
-%bcond_with ldplayer
+%bcond_without ldplayer
%bcond_with debug
%global baseversion 141
-%global sourceupdate 3
+%global sourceupdate 4
Name: mame
%if 0%{?sourceupdate}
@@ -26,7 +26,7 @@
Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
-#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
+Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
%endif
Patch0: %{name}-fortify.patch
Patch2: %{name}-verbosebuild.patch
@@ -104,11 +104,12 @@
cat > %{name}.ini << EOF
# Define multi-user paths
artpath %{_datadir}/%{name}/artwork;%{_datadir}/%{name}/effects
+cheatpath %{_datadir}/%{name}/cheats
ctrlrpath %{_datadir}/%{name}/ctrlr
fontpath %{_datadir}/%{name}/fonts
+hashpath %{_datadir}/%{name}/hash
rompath %{_datadir}/%{name}/roms;%{_datadir}/%{name}/chds
samplepath %{_datadir}/%{name}/samples
-cheatpath %{_datadir}/%{name}/cheats
# Allow user to override ini settings
inipath \$HOME/.%{name}/ini;%{_sysconfdir}/%{name}
@@ -150,17 +151,6 @@
rm -rf $RPM_BUILD_ROOT
# create directories
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/artwork
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/chds
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/ctrlr
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/effects
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/roms
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/samples
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/cheats
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/cfg
install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/comments
@@ -171,10 +161,21 @@
install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/nvram
install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/snap
install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/sta
+install -d $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/artwork
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/chds
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/cheats
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/ctrlr
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/effects
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/hash
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/roms
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/samples
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
-# install binaries and config files
+# install files
install -pm 644 %{name}.ini $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-install -pm 644 src/osd/sdl/keymaps/* $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps
%if %{with ldplayer}
install -pm 755 ldplayer $RPM_BUILD_ROOT%{_bindir}
%endif
@@ -190,6 +191,8 @@
do
install -pm 755 $tool $RPM_BUILD_ROOT%{_bindir}/%{name}-$tool
done
+install -pm 644 megatech.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/hash
+install -pm 644 src/osd/sdl/keymaps/* $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps
pushd src/osd/sdl/man
%if %{with ldplayer}
install -pm 644 ldplayer.1 $RPM_BUILD_ROOT%{_mandir}/man1
@@ -208,6 +211,7 @@
%doc docs/* whatsnew*.txt
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.ini
%dir %{_sysconfdir}/%{name}
+%{_sysconfdir}/skel/.%{name}
%if %{with debug}
%{_bindir}/%{name}d
%else
@@ -215,7 +219,6 @@
%endif
%{_datadir}/%{name}
%{_mandir}/man1/mame.1*
-%{_sysconfdir}/skel/.%{name}
%files tools
%defattr(-,root,root,-)
@@ -246,6 +249,12 @@
%changelog
+* Fri Mar 25 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141u4-1
+- Updated to 0.141u4
+- Re-enabled ldplayer
+- Added support for hash files
+- Sorted the %%install section alphabetically
+
* Mon Feb 28 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141u3-1
- Updated to 0.141u3
- Filtered out redundant $RPM_OPT_FLAGS
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-13/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 28 Feb 2011 21:32:58 -0000 1.21
+++ sources 26 Mar 2011 09:10:51 -0000 1.22
@@ -2,3 +2,4 @@
b9e2d7b1200cb53044350fd73bac25f8 0141u1_diff.zip
66a6df9cfadd27e08aadd320c5ff7774 0141u2_diff.zip
84b7d0d45fbb66e39ca8d50db5569083 0141u3_diff.zip
+420c905816e962c8294f03bd7cd02eae 0141u4_diff.zip
13 years, 8 months
rpms/mame/F-14 .cvsignore, 1.22, 1.23 mame.spec, 1.27, 1.28 sources, 1.22, 1.23
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28788
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Fri Mar 25 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141u4-1
- Updated to 0.141u4
- Re-enabled ldplayer
- Added support for hash files
- Sorted the %install section alphabetically
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-14/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore 28 Feb 2011 21:32:48 -0000 1.22
+++ .cvsignore 26 Mar 2011 09:10:42 -0000 1.23
@@ -2,3 +2,4 @@
0141u1_diff.zip
0141u2_diff.zip
0141u3_diff.zip
+0141u4_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-14/mame.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mame.spec 28 Feb 2011 21:54:06 -0000 1.27
+++ mame.spec 26 Mar 2011 09:10:42 -0000 1.28
@@ -1,11 +1,11 @@
# ldplayer can be disabled by --without ldplayer or by changing to %bcond_with
# if it does not build. The debug build is disabled by default, please use
# --with debug to override
-%bcond_with ldplayer
+%bcond_without ldplayer
%bcond_with debug
%global baseversion 141
-%global sourceupdate 3
+%global sourceupdate 4
Name: mame
%if 0%{?sourceupdate}
@@ -26,7 +26,7 @@
Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
-#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
+Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
%endif
Patch0: %{name}-fortify.patch
Patch2: %{name}-verbosebuild.patch
@@ -104,11 +104,12 @@
cat > %{name}.ini << EOF
# Define multi-user paths
artpath %{_datadir}/%{name}/artwork;%{_datadir}/%{name}/effects
+cheatpath %{_datadir}/%{name}/cheats
ctrlrpath %{_datadir}/%{name}/ctrlr
fontpath %{_datadir}/%{name}/fonts
+hashpath %{_datadir}/%{name}/hash
rompath %{_datadir}/%{name}/roms;%{_datadir}/%{name}/chds
samplepath %{_datadir}/%{name}/samples
-cheatpath %{_datadir}/%{name}/cheats
# Allow user to override ini settings
inipath \$HOME/.%{name}/ini;%{_sysconfdir}/%{name}
@@ -150,17 +151,6 @@
rm -rf $RPM_BUILD_ROOT
# create directories
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/artwork
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/chds
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/ctrlr
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/effects
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/roms
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/samples
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/cheats
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/cfg
install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/comments
@@ -171,10 +161,21 @@
install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/nvram
install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/snap
install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/sta
+install -d $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/artwork
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/chds
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/cheats
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/ctrlr
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/effects
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/hash
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/roms
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/samples
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
-# install binaries and config files
+# install files
install -pm 644 %{name}.ini $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-install -pm 644 src/osd/sdl/keymaps/* $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps
%if %{with ldplayer}
install -pm 755 ldplayer $RPM_BUILD_ROOT%{_bindir}
%endif
@@ -190,6 +191,8 @@
do
install -pm 755 $tool $RPM_BUILD_ROOT%{_bindir}/%{name}-$tool
done
+install -pm 644 megatech.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/hash
+install -pm 644 src/osd/sdl/keymaps/* $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps
pushd src/osd/sdl/man
%if %{with ldplayer}
install -pm 644 ldplayer.1 $RPM_BUILD_ROOT%{_mandir}/man1
@@ -208,6 +211,7 @@
%doc docs/* whatsnew*.txt
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.ini
%dir %{_sysconfdir}/%{name}
+%{_sysconfdir}/skel/.%{name}
%if %{with debug}
%{_bindir}/%{name}d
%else
@@ -215,7 +219,6 @@
%endif
%{_datadir}/%{name}
%{_mandir}/man1/mame.1*
-%{_sysconfdir}/skel/.%{name}
%files tools
%defattr(-,root,root,-)
@@ -246,6 +249,12 @@
%changelog
+* Fri Mar 25 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141u4-1
+- Updated to 0.141u4
+- Re-enabled ldplayer
+- Added support for hash files
+- Sorted the %%install section alphabetically
+
* Mon Feb 28 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141u3-1
- Updated to 0.141u3
- Filtered out redundant $RPM_OPT_FLAGS
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-14/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 28 Feb 2011 21:32:48 -0000 1.22
+++ sources 26 Mar 2011 09:10:42 -0000 1.23
@@ -2,3 +2,4 @@
b9e2d7b1200cb53044350fd73bac25f8 0141u1_diff.zip
66a6df9cfadd27e08aadd320c5ff7774 0141u2_diff.zip
84b7d0d45fbb66e39ca8d50db5569083 0141u3_diff.zip
+420c905816e962c8294f03bd7cd02eae 0141u4_diff.zip
13 years, 8 months