7:14 p.m.
Author: belegdol
Update of /cvs/free/rpms/mplayer/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18224
Modified Files:
mplayer-manlinks.patch mplayer.spec
Log Message:
* Tue Feb 28 2012 Julian Sikorski <belegdol(a)fedoraproject.org> -
1.0-0.128.20110816svn
- Added libbs2b-devel to BuildRequires (RPM Fusion bug #2157)
- Fixed --with directfb (RPM Fusion bug #2141)
- Don't mangle the manpages (RPM Fusion bug #1994)
- Fixed man links (RPM Fusion bug #1625)
- Dropped obsolete Group, Buildroot, %clean and %defattr
mplayer-manlinks.patch:
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: mplayer-manlinks.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-15/mplayer-manlinks.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mplayer-manlinks.patch 30 Oct 2009 01:10:22 -0000 1.4
+++ mplayer-manlinks.patch 28 Feb 2012 19:14:41 -0000 1.5
@@ -1,31 +1,31 @@
-diff -up mplayer-export-2009-10-29/Makefile.manlinks mplayer-export-2009-10-29/Makefile
---- mplayer-export-2009-10-29/Makefile.manlinks 2009-10-19 11:56:18.000000000 +0200
-+++ mplayer-export-2009-10-29/Makefile 2009-10-30 00:42:36.000000000 +0100
-@@ -922,10 +922,10 @@ install-mencoder-man: $(foreach lang,$(M
+diff -up mplayer-export-2012-02-04/Makefile.manlinks mplayer-export-2012-02-04/Makefile
+--- mplayer-export-2012-02-04/Makefile.manlinks 2012-02-27 13:46:39.000000000 +0100
++++ mplayer-export-2012-02-04/Makefile 2012-02-27 20:43:47.286424087 +0100
+@@ -919,10 +919,10 @@ install-mencoder-man: $(foreach lang,$(M
install-mplayer-man: $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang))
install-gui-man-en: install-mplayer-man-en
- cd $(MANDIR)/man1/ && ln -sf mplayer.1 gmplayer.1
-+ echo ".so mplayer.1" > $(MANDIR)/man1/gmplayer.1
++ echo ".so man1/mplayer.1" > $(MANDIR)/man1/gmplayer.1
install-mencoder-man-en: install-mplayer-man-en
- cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1
-+ echo ".so mplayer.1" > $(MANDIR)/man1/mencoder.1
++ echo ".so man1/mplayer.1" > $(MANDIR)/man1/mencoder.1
install-mplayer-man-en:
$(INSTALL) -d $(MANDIR)/man1
-@@ -933,12 +933,12 @@ install-mplayer-man-en:
+@@ -936,12 +936,12 @@ endef
define GUI_MAN_RULE
install-gui-man-$(lang): install-mplayer-man-$(lang)
- cd $(MANDIR)/$(lang)/man1/ && ln -sf mplayer.1 gmplayer.1
-+ echo ".so mplayer.1" > $(MANDIR)/$(lang)/man1/gmplayer.1
++ echo ".so man1/mplayer.1" > $(MANDIR)/$(lang)/man1/gmplayer.1
endef
define MENCODER_MAN_RULE
install-mencoder-man-$(lang): install-mplayer-man-$(lang)
- cd $(MANDIR)/$(lang)/man1 && ln -sf mplayer.1 mencoder.1
-+ echo ".so mplayer.1" > $(MANDIR)/$(lang)/man1/mencoder.1
++ echo ".so man1/mplayer.1" > $(MANDIR)/$(lang)/man1/mencoder.1
endef
define MPLAYER_MAN_RULE
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-15/mplayer.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- mplayer.spec 10 Jan 2012 06:41:43 -0000 1.41
+++ mplayer.spec 28 Feb 2012 19:14:41 -0000 1.42
@@ -6,10 +6,9 @@
Name: mplayer
Version: 1.0
-Release: 0.127.%{pre}%{?dist}
+Release: 0.128.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
-Group: Applications/Multimedia
%if 0%{!?_without_amr:1}
License: GPLv3+
%else
@@ -32,7 +31,6 @@
Patch14: %{name}-nodvdcss.patch
# use system FFmpeg libraries
Patch18: %{name}-ffmpeg.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
BuildRequires: a52dec-devel
@@ -61,6 +59,7 @@
BuildRequires: libXxf86vm-devel
BuildRequires: libass-devel >= 0.9.10
BuildRequires: libbluray-devel
+BuildRequires: libbs2b-devel
BuildRequires: libcaca-devel
BuildRequires: libdca-devel
BuildRequires: libdv-devel
@@ -130,14 +129,12 @@
%package common
Summary: MPlayer common files
-Group: Applications/Multimedia
%description common
This package contains common files for MPlayer packages.
%package gui
Summary: GUI for MPlayer
-Group: Applications/Multimedia
Requires: mplayer-common = %{version}-%{release}
Requires: hicolor-icon-theme
@@ -146,7 +143,6 @@
%package -n mencoder
Summary: MPlayer movie encoder
-Group: Applications/Multimedia
Requires: mplayer-common = %{version}-%{release}
%description -n mencoder
@@ -154,14 +150,12 @@
%package doc
Summary: MPlayer documentation in various languages
-Group: Documentation
%description doc
MPlayer documentation in various languages.
%package tools
Summary: Useful scripts for MPlayer
-Group: Applications/Multimedia
Requires: mencoder = %{version}-%{release}
Requires: mplayer = %{version}-%{release}
@@ -206,7 +200,7 @@
\\\
--disable-bitmap-font \\\
%{!?_with_dga:--disable-dga1 --disable-dga2} \\\
- --%{?_with_directfb:enable}%{!?_with_directfb:disable}-directfb \\\
+ %{!?_with_directfb:--disable-directfb} \\\
%{!?_with_svgalib:--disable-svga} \\\
--disable-termcap \\\
--enable-xvmc \\\
@@ -229,14 +223,6 @@
%patch14 -p1 -b .nodvdcss
%patch18 -p1 -b .ffmpeg
-doconv() {
- iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
- mv DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1
-}
-for lang in de es fr it ; do doconv iso-8859-1 utf-8 $lang ; done
-for lang in hu pl ; do doconv iso-8859-2 utf-8 $lang ; done
-for lang in ru ; do doconv koi8-r utf-8 $lang ; done
-
mkdir GUI
cp -a `ls -1|grep -v GUI` GUI/
@@ -323,16 +309,10 @@
update-desktop-database &>/dev/null || :
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
-%defattr(-, root, root, -)
%{_bindir}/mplayer
%files common
-%defattr(-, root, root, -)
%doc AUTHORS Changelog Copyright LICENSE README
%dir %{_sysconfdir}/mplayer
%config(noreplace) %{_sysconfdir}/mplayer/mplayer.conf
@@ -352,14 +332,12 @@
%lang(zh_CN) %{_mandir}/zh_CN/man1/mplayer.1*
%files gui
-%defattr(-, root, root, -)
%{_bindir}/gmplayer
%{_datadir}/applications/*mplayer.desktop
%{_datadir}/icons/hicolor/48x48/apps/mplayer.png
%{_datadir}/mplayer/skins/
%files -n mencoder
-%defattr(-, root, root, -)
%{_bindir}/mencoder
%{_mandir}/man1/mencoder.1*
%lang(cs) %{_mandir}/cs/man1/mencoder.1*
@@ -373,7 +351,6 @@
%lang(zh_CN) %{_mandir}/zh_CN/man1/mencoder.1*
%files doc
-%defattr(-, root, root, -)
%doc doc/en/ doc/tech/
%lang(cs) %doc doc/cs/
%lang(de) %doc doc/de/
@@ -385,7 +362,6 @@
%lang(zh_CN) %doc doc/zh_CN/
%files tools
-%defattr(-, root, root, -)
%{_bindir}/aconvert
%{_bindir}/calcbpp
%{_bindir}/countquant
@@ -400,6 +376,13 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Tue Feb 28 2012 Julian Sikorski <belegdol(a)fedoraproject.org> -
1.0-0.128.20110816svn
+- Added libbs2b-devel to BuildRequires (RPM Fusion bug #2157)
+- Fixed --with directfb (RPM Fusion bug #2141)
+- Don't mangle the manpages (RPM Fusion bug #1994)
+- Fixed man links (RPM Fusion bug #1625)
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+
* Tue Jan 10 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-0.127.20110816svn
- Rebuild for FFmpeg