12:06 a.m.
Author: rathann
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27532
Modified Files:
.cvsignore mplayer.spec sources
Added Files:
mplayer-man-zh_CN.patch
Removed Files:
mplayer-r27449.patch
Log Message:
* Mon Aug 18 2008 Dominik Mierzejewski <rpm at greysector.net> -
1.0-0.97.20080818svn
- updated to latest SVN snapshot
- dropped obsolete patches
- installed aconvert.sh to bindir
- fixed zh_CN manpage installation
mplayer-man-zh_CN.patch:
--- NEW FILE mplayer-man-zh_CN.patch ---
diff -up mplayer-export-2008-08-18/configure.man-zh_CN
mplayer-export-2008-08-18/configure
--- mplayer-export-2008-08-18/configure.man-zh_CN 2008-08-18 22:53:34.000000000 +0200
+++ mplayer-export-2008-08-18/configure 2008-08-18 23:33:58.000000000 +0200
@@ -185,7 +185,7 @@ case `echo -n` in
esac
msg_lang_all=`echo help/help_mp-??.h help/help_mp-??_??.h | sed -e
"s:help/help_mp-\(..\).h:\1:g" -e "s:help/help_mp-\(.....\).h:\1:g"`
-man_lang_all=`echo DOCS/man/??/mplayer.1 | sed -e
"s:DOCS/man/\(..\)/mplayer.1:\1:g"`
+man_lang_all=`echo DOCS/man/??/mplayer.1 DOCS/man/??_??/mplayer.1 | sed -e
"s:DOCS/man/\(..\)/mplayer.1:\1:g" -e
"s:DOCS/man/\(.._..\)/mplayer.1:\1:g"`
doc_lang_all=`echo DOCS/xml/??/ DOCS/xml/??_??/ | sed -e
"s:DOCS/xml/\(..\)/:\1:g" -e "s:DOCS/xml/\(.._..\)/:\1:g"`
show_help(){
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 9 Aug 2008 09:32:32 -0000 1.2
+++ .cvsignore 19 Aug 2008 00:06:56 -0000 1.3
@@ -1,2 +1,2 @@
Blue-1.7.tar.bz2
-mplayer-export-2008-06-13.tar.bz2
+mplayer-export-2008-08-18.tar.bz2
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mplayer.spec 17 Aug 2008 21:48:07 -0000 1.2
+++ mplayer.spec 19 Aug 2008 00:06:57 -0000 1.3
@@ -1,13 +1,13 @@
%define codecdir %{_libdir}/codecs
-%define pre 20080613svn
+%define pre 20080818svn
%define svn 1
-%define svnbuild 2008-06-13
-%define svnrev 27055
+%define svnbuild 2008-08-18
+%define svnrev 27470
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.0
-Release: 0.96.%{pre}%{?dist}
+Release: 0.97.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -23,7 +23,7 @@
Patch5: %{name}-x86_32-compile.patch
Patch8: %{name}-manlinks.patch
Patch10: %{name}-qcelp.patch
-Patch11: %{name}-r27449.patch
+Patch12: %{name}-man-zh_CN.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
@@ -144,7 +144,7 @@
%patch5 -p1 -b .compile
%patch8 -p1 -b .manlinks
%patch10 -p1 -b .qclp
-%patch11 -p0
+%patch12 -p1 -b .man-zh_CN
doconv() {
iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
@@ -172,9 +172,9 @@
--libdir=%{_libdir} \
--codecsdir=%{codecdir} \
\
- --disable-encoder=FAAC \
- --disable-encoder=MP3LAME \
- --disable-encoder=X264 \
+ --disable-faac-lavc \
+ --disable-mp3lame-lavc \
+ --disable-x264-lavc \
\
--enable-gui \
--enable-largefiles \
@@ -226,9 +226,9 @@
--libdir=%{_libdir} \
--codecsdir=%{codecdir} \
\
- --disable-encoder=FAAC \
- --disable-encoder=MP3LAME \
- --disable-encoder=X264 \
+ --disable-faac-lavc \
+ --disable-mp3lame-lavc \
+ --disable-x264-lavc \
\
--enable-largefiles \
--enable-unrarexec \
@@ -278,7 +278,9 @@
rm -rf $RPM_BUILD_ROOT doc
make install DESTDIR=$RPM_BUILD_ROOT STRIPBINARIES=no
-install -pm 755 TOOLS/midentify $RPM_BUILD_ROOT%{_bindir}/
+for file in aconvert.sh midentify.sh ; do
+install -pm 755 TOOLS/$file $RPM_BUILD_ROOT%{_bindir}/
+done
# Clean up documentation
mkdir doc
@@ -341,7 +343,8 @@
%config(noreplace) %{_sysconfdir}/mplayer/mplayer.conf
%config(noreplace) %{_sysconfdir}/mplayer/input.conf
%config(noreplace) %{_sysconfdir}/mplayer/menu.conf
-%{_bindir}/midentify
+%{_bindir}/aconvert.sh
+%{_bindir}/midentify.sh
%{_bindir}/mplayer
%dir %{codecdir}/
%dir %{_datadir}/mplayer/
@@ -391,6 +394,12 @@
%changelog
+* Mon Aug 18 2008 Dominik Mierzejewski <rpm at greysector.net> -
1.0-0.97.20080818svn
+- updated to latest SVN snapshot
+- dropped obsolete patches
+- installed aconvert.sh to bindir
+- fixed zh_CN manpage installation
+
* Sun Aug 17 2008 Dominik Mierzejewski <rpm at greysector.net> -
1.0-0.96.20080613svn
- live-devel is now live555-devel
- added missing libXScrnSaver-devel BR
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 9 Aug 2008 09:32:32 -0000 1.2
+++ sources 19 Aug 2008 00:06:57 -0000 1.3
@@ -1,2 +1,2 @@
e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
-86fe793e1f0dccc48b97cf39c8e232c3 mplayer-export-2008-06-13.tar.bz2
+f09caa71435c9c8818c2f681722042a7 mplayer-export-2008-08-18.tar.bz2
--- mplayer-r27449.patch DELETED ---