SPECS (DEVEL): mplayer.spec - reverted to 1.369.2.11

[megabajt]

Author: megabajt                     Date: Mon Mar  9 19:06:07 2009 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- reverted to 1.369.2.11

---- Files affected:
SPECS:
   mplayer.spec (1.369.2.12 -> 1.369.2.13) 

---- Diffs:

================================================================
Index: SPECS/mplayer.spec
diff -u SPECS/mplayer.spec:1.369.2.12 SPECS/mplayer.spec:1.369.2.13
--- SPECS/mplayer.spec:1.369.2.12	Mon Mar  9 19:41:46 2009
+++ SPECS/mplayer.spec	Mon Mar  9 20:06:01 2009
@@ -57,8 +57,7 @@
 %bcond_with	amr		# enable 3GPP Adaptive Multi Rate (AMR) speech codec support
 %bcond_without	gnomess		# disable controling gnome screensaver
 %bcond_with	ssse3	# sse3 optimizations (needs binutils >= 2.16.92)
-%bcond_without dshowserver      # disable directshow codecs server
-#%{?without_dshowserver: %without_win32}
+
 %ifnarch %{ix86}
 %undefine	with_win32
 %undefine	with_quicktime
@@ -75,7 +74,7 @@
 %define        _suf    32
 %endif
 
-%define		_rel	0.1wk
+%define		_rel	0.1
 %define		_rc	rc2
 
 Summary:	MPlayer - THE Movie Player for UN*X
@@ -105,7 +104,6 @@
 Source8:	%{name}.desktop
 # http://www.on2.com/gpl/mplayer/
 Source9:	http://www.on2.com/gpl/mplayer/2007-10-09-mencoder-on2flixenglinux.tar.bz2
-%{!?without_dshowserver:Source50:	coreserve}
 # Source9-md5:	2361e56b40f52dfc20131e458e2aed38
 Patch1:		%{name}-cp1250-fontdesc.patch
 Patch2:		%{name}-codec.patch
@@ -124,7 +122,6 @@
 Patch19:	%{name}-on2flix.patch
 Patch22:	%{name}-ffmpeg.patch
 Patch23:	%{name}-live.patch
-%{!?without_dshowserver:Patch50: %{name}-dshowserver.patch}
 URL:		http://www.mplayerhq.hu/
 %{?with_directfb:BuildRequires:	DirectFB-devel}
 BuildRequires:	OpenAL-devel
@@ -339,7 +336,6 @@
 
 %patch22 -p1
 %patch23 -p1
-%{!?without_dshowserver:%patch50 -p1}
 
 %build
 %if %{with shared}
@@ -493,14 +489,12 @@
 cp -r font-* $RPM_BUILD_ROOT%{_datadir}/mplayer
 ln -sf font-arial-iso-8859-2/font-arial-24-iso-8859-2 $RPM_BUILD_ROOT%{_datadir}/mplayer/font
 
-
 %if %{with gui}
 ln -s Blue $RPM_BUILD_ROOT%{_datadir}/%{name}/Skin/default
 install %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir}
 %endif
 install %{SOURCE8} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE7} $RPM_BUILD_ROOT%{_pixmapsdir}
-%{!?without_dshowserver:install %{SOURCE50} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/codecs}
 
 # man pages
 install DOCS/man/cs/*.1 $RPM_BUILD_ROOT%{_mandir}/cs/man1
@@ -590,8 +584,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.369.2.12  2009/03/09 18:41:46  w.kier
-- reverted to 1.38
+Revision 1.369.2.13  2009/03/09 19:06:01  megabajt
+- reverted to 1.369.2.11
 
 Revision 1.369.2.11  2007/10/22 22:54:33  glen
 - builds with more than one jobserver
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mplayer.spec?r1=1.369.2.12&r2=1.369.2.13&f=u