From ae1a21e41b30f23878ae41ab7e974e62d52d3540 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Tue, 31 Mar 2009 18:14:20 +0000 Subject: [PATCH] - drop obsolete patch --- mplayer-htmldocs.patch | 12 ------------ mplayer.spec | 5 +++-- 2 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 mplayer-htmldocs.patch diff --git a/mplayer-htmldocs.patch b/mplayer-htmldocs.patch deleted file mode 100644 index 477a455..0000000 --- a/mplayer-htmldocs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up mplayer-export-2009-03-19/DOCS/xml/configure.htmldocs mplayer-export-2009-03-19/DOCS/xml/configure ---- mplayer-export-2009-03-19/DOCS/xml/configure.htmldocs 2009-03-17 12:47:27.000000000 +0100 -+++ mplayer-export-2009-03-19/DOCS/xml/configure 2009-03-19 21:48:30.000000000 +0100 -@@ -187,7 +187,7 @@ then - then - echo "Found xsltproc. If it works, it's probably the best choice." - # HACK: xslt always need a target file if a doctype is set -- _xsltcommand="OUTPUT=\"\$1\"; if test -d \"\$OUTPUT\" ; then OUTPUT=\"$OUTPUT/dummy.html\" ; fi;" -+ _xsltcommand="OUTPUT=\"\$1\"; if test -d \"\$OUTPUT\" ; then OUTPUT=\"\$OUTPUT/dummy.html\" ; fi;" - if test -n "$_catalog" - then - _xsltcommand="$_xsltcommand xsltproc --catalogs -o \$OUTPUT \$2 \$3" diff --git a/mplayer.spec b/mplayer.spec index 53bcea9..1955a5c 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -20,7 +20,7 @@ Source0: http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{pre %endif Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2 Source10: mplayer-snapshot.sh -Patch1: %{name}-htmldocs.patch +Patch1: %{name}-ppc-compile.patch Patch2: %{name}-config.patch Patch3: %{name}-cflags.patch Patch8: %{name}-manlinks.patch @@ -190,7 +190,7 @@ MPlayer documentation in various languages. %else %setup -q -n MPlayer-%{version}%{pre} %endif -%patch1 -p1 -b .htmldocs +%patch1 -p1 -b .ppc-compile %patch2 -p1 -b .config %patch3 -p1 -b .cflags %patch8 -p1 -b .manlinks @@ -343,6 +343,7 @@ rm -rf $RPM_BUILD_ROOT * Sun Mar 29 2009 Dominik Mierzejewski - 1.0-0.109.20090329svn - 20090329 snapshot from 1.0rc3 branch - fix RPM_OPT_FLAGS usage +- drop obsolete patch * Sun Mar 29 2009 Thorsten Leemhuis - 1.0-0.108.20090319svn - rebuild for new F11 features