speclint police: merge with mplayer.patch

mplayer/live.patch

@@ -1,39 +0,0 @@
-diff -Naur live.orig/config.solaris live/config.solaris
---- live.orig/config.solaris	2003-08-07 09:52:11.000000000 +0200
-+++ live/config.solaris	2003-08-13 18:31:12.542868000 +0200
-@@ -1,4 +1,4 @@
--COMPILE_OPTS =		$(INCLUDES) -I. -O -DSOLARIS
-+COMPILE_OPTS =		$(INCLUDES) -I. -O -DSOLARIS -DSOCKLEN_T=socklen_t
- C =			c
- C_COMPILER =		cc
- C_FLAGS =		$(COMPILE_OPTS)
-diff -Naur live.orig/groupsock/Groupsock.cpp live/groupsock/Groupsock.cpp
---- live.orig/groupsock/Groupsock.cpp	Thu Aug  7 09:52:09 2003
-+++ live/groupsock/Groupsock.cpp	Wed Aug 13 14:59:36 2003
-@@ -24,9 +24,9 @@
- #include "TunnelEncaps.hh"
- 
- #if defined(__WIN32__) || defined(_WIN32)
--#include <strstrea.h>
-+#include <strstrea>
- #else
--#include <strstream.h>
-+#include <strstream>
- #endif
- #include <stdio.h>
- 
-diff -Naur live.orig/groupsock/NetInterface.cpp live/groupsock/NetInterface.cpp
---- live.orig/groupsock/NetInterface.cpp	Thu Aug  7 09:52:09 2003
-+++ live/groupsock/NetInterface.cpp	Wed Aug 13 15:00:00 2003
-@@ -22,9 +22,9 @@
- #include "GroupsockHelper.hh"
- 
- #if defined(__WIN32__) || defined(_WIN32)
--#include <strstrea.h>
-+#include <strstrea>
- #else
--#include <strstream.h>
-+#include <strstream>
- #endif
- 
- ////////// NetInterface //////////

mplayer/mplayer.patch

@@ -203,3 +203,42 @@
  #CFLAGS=-I. -I.. -O $(WARN_FLAGS) -g #-fno-omit-frame-pointer
  
  all: libloader.a
+diff -Naur live.orig/config.solaris live/config.solaris
+--- live.orig/config.solaris	2003-08-07 09:52:11.000000000 +0200
++++ live/config.solaris	2003-08-13 18:31:12.542868000 +0200
+@@ -1,4 +1,4 @@
+-COMPILE_OPTS =		$(INCLUDES) -I. -O -DSOLARIS
++COMPILE_OPTS =		$(INCLUDES) -I. -O -DSOLARIS -DSOCKLEN_T=socklen_t
+ C =			c
+ C_COMPILER =		cc
+ C_FLAGS =		$(COMPILE_OPTS)
+diff -Naur live.orig/groupsock/Groupsock.cpp live/groupsock/Groupsock.cpp
+--- live.orig/groupsock/Groupsock.cpp	Thu Aug  7 09:52:09 2003
++++ live/groupsock/Groupsock.cpp	Wed Aug 13 14:59:36 2003
+@@ -24,9 +24,9 @@
+ #include "TunnelEncaps.hh"
+ 
+ #if defined(__WIN32__) || defined(_WIN32)
+-#include <strstrea.h>
++#include <strstrea>
+ #else
+-#include <strstream.h>
++#include <strstream>
+ #endif
+ #include <stdio.h>
+ 
+diff -Naur live.orig/groupsock/NetInterface.cpp live/groupsock/NetInterface.cpp
+--- live.orig/groupsock/NetInterface.cpp	Thu Aug  7 09:52:09 2003
++++ live/groupsock/NetInterface.cpp	Wed Aug 13 15:00:00 2003
+@@ -22,9 +22,9 @@
+ #include "GroupsockHelper.hh"
+ 
+ #if defined(__WIN32__) || defined(_WIN32)
+-#include <strstrea.h>
++#include <strstrea>
+ #else
+-#include <strstream.h>
++#include <strstream>
+ #endif
+ 
+ ////////// NetInterface //////////

mplayer/mplayer.spec

@@ -38,7 +38,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Video
 License:      GPL and others
 Version:      %{V_mplayer}
-Release:      20030814
+Release:      20030830
 
 #   build options
 %option       with_gui    no
@@ -52,7 +52,6 @@ Source3:      ftp://ftp.mplayerhq.hu/MPlayer/releases/codecs/qt5dlls.tar.bz2
 Source4:      ftp://ftp.mplayerhq.hu/MPlayer/Skin/Blue-%{V_blue}.tar.bz2
 Source5:      http://www.live.com/liveMedia/public/live.%{V_live}.tar.gz
 Patch0:       mplayer.patch
-Patch1:       live.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -79,7 +78,6 @@ AutoReqProv:  no
     %setup0 -q -n MPlayer-%{V_mplayer}
     %setup5 -q -n MPlayer-%{V_mplayer} -T -D -a 5
     %patch0 -p0
-    %patch1 -p0
     %{l_shtool} subst \
         -e 's;u_int\([0-9]*\)_t;uint\1_t;g' \
         live/groupsock/include/NetAddress.hh \