SPECS: mplayer.spec - updated system-amr patch is back - kerneltwo...

[qboosh]

Author: qboosh                       Date: Fri Nov 17 18:09:55 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated system-amr patch is back
- kerneltwosix hack no longer exists

---- Files affected:
SPECS:
   mplayer.spec (1.345 -> 1.346) 

---- Diffs:

================================================================
Index: SPECS/mplayer.spec
diff -u SPECS/mplayer.spec:1.345 SPECS/mplayer.spec:1.346
--- SPECS/mplayer.spec:1.345	Thu Oct 26 01:47:44 2006
+++ SPECS/mplayer.spec	Fri Nov 17 19:09:49 2006
@@ -114,6 +114,7 @@
 Patch3:		%{name}-home_etc.patch
 Patch4:		%{name}-350.patch
 Patch5:		%{name}-configure.patch
+Patch6:		%{name}-system-amr.patch
 Patch8:		%{name}-altivec.patch
 Patch10:	%{name}-pcmsplit.patch
 Patch11:	%{name}-bio2jack.patch
@@ -318,6 +319,7 @@
 ##%patch3 -p1	-- old home_etc behavior
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 %patch8 -p1
 #%%patch10 -p1
 #%patch11 -p1	# maybe TODO, JACK audio output rewritten without bio2jack
@@ -333,10 +335,9 @@
 %patch19 -p1
 %endif
 
-# kill evil file, hackery not needed with llh
-echo > osdep/kerneltwosix.h
-
+%if %{with snapshot}
 find . -type d -name CVS -print | xargs rm -rf
+%endif
 
 %build
 %if %{with shared}
@@ -586,6 +587,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.346  2006/11/17 18:09:49  qboosh
+- updated system-amr patch is back
+- kerneltwosix hack no longer exists
+
 Revision 1.345  2006/10/25 23:47:44  wolf
 - fixed
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mplayer.spec?r1=1.345&r2=1.346&f=u