upgrading package: mozilla-mplayer 0.95 -> 1.0p2t2

mozilla-mplayer/mozilla-mplayer.patch

@@ -1,17 +1,7 @@
 Index: Source/mplayerplug-in.c
---- Source/mplayerplug-in.c.orig	2003-10-03 16:54:52.000000000 +0200
-+++ Source/mplayerplug-in.c	2003-10-05 20:01:29.000000000 +0200
-@@ -28,6 +28,9 @@
-  */
- 
- #include "mplayerplug-in.h"
-+#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-+#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP PTHREAD_MUTEX_INITIALIZER
-+#endif
- pthread_mutex_t playlist_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
- 
- // This routine is only called when the plugin library is newer than the pluginrc file
-@@ -71,7 +74,7 @@
+--- Source/mplayerplug-in.c.orig	2003-10-20 19:11:32.000000000 +0200
++++ Source/mplayerplug-in.c	2003-10-20 20:21:46.000000000 +0200
+@@ -70,7 +70,7 @@
      }
  
      if (config == NULL) {
@@ -20,7 +10,7 @@ Index: Source/mplayerplug-in.c
      }
  
      if (config == NULL) {
-@@ -148,7 +151,7 @@
+@@ -147,7 +147,7 @@
  	}
  
  	if (customtypes == NULL) {
@@ -30,9 +20,9 @@ Index: Source/mplayerplug-in.c
  
  	if (customtypes != NULL) {
 Index: Source/support.c
---- Source/support.c.orig	2003-10-03 16:51:20.000000000 +0200
-+++ Source/support.c	2003-10-05 20:02:40.000000000 +0200
-@@ -114,7 +114,7 @@
+--- Source/support.c.orig	2003-10-20 19:11:32.000000000 +0200
++++ Source/support.c	2003-10-20 20:21:46.000000000 +0200
+@@ -113,7 +113,7 @@
      }
  
      if (config == NULL) {
@@ -42,9 +32,9 @@ Index: Source/support.c
  
      if (config == NULL) {
 Index: mplayerplug-in.types
---- mplayerplug-in.types.orig	2003-09-30 22:41:49.000000000 +0200
-+++ mplayerplug-in.types	2003-10-12 11:48:58.000000000 +0200
-@@ -31,4 +31,4 @@
+--- mplayerplug-in.types.orig	2003-10-17 18:28:13.000000000 +0200
++++ mplayerplug-in.types	2003-10-20 20:21:46.000000000 +0200
+@@ -32,4 +32,4 @@
  audio/x-ms-wma:wma:Windows Media;
  application/x-drm-v2:asx:Windows Media;
  audio/wav:wav:Microsoft wave file;

mozilla-mplayer/mozilla-mplayer.spec

@@ -23,6 +23,10 @@
 ##  SUCH DAMAGE.
 ##
 
+#   package version
+%define       V_dist  1.0pre2-test2
+%define       V_opkg  1.0p2t2
+
 #   package information
 Name:         mozilla-mplayer
 Summary:      Mozilla MPlayer Plugin
@@ -32,11 +36,11 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [EVAL]
 Group:        Web
 License:      GPL
-Version:      0.95
-Release:      20031012
+Version:      %{V_opkg}
+Release:      20031020
 
 #   list of sources
-Source0:      http://osdn.dl.sourceforge.net/mplayerplug-in/mplayerplug-in-%{version}.tar.gz
+Source0:      http://osdn.dl.sourceforge.net/mplayerplug-in/mplayerplug-in-%{V_dist}.tar.gz
 Patch0:       mozilla-mplayer.patch
 
 #   build information
@@ -58,19 +62,15 @@ AutoReqProv:  no
     %{l_shtool} subst %{l_value -s l_prefix} Source/*.c
 
 %build
-    cflags="%{l_cflags}"
-    cflags="$cflags -DXP_UNIX -fPIC -I./include"
-    cflags="$cflags -I`%{l_prefix}/etc/rc --query x11_incdir`"
-    ldflags="%{l_ldflags}"
-    ldflags="$ldflags -L`%{l_prefix}/etc/rc --query x11_libdir`"
-    case "%{l_platform -t}" in
-        *-freebsd4* ) ldflags="$ldflags -lc_r"     ;;
-        *           ) ldflags="$ldflags -lpthread" ;;
-    esac
-    %{l_make} %{l_mflags -O} \
-        CC="%{l_cc}" \
-        CFLAGS="$cflags" \
-        LDFLAGS="$ldflags"
+    CC="%{l_cc}" \
+    CFLAGS="%{l_cflags -O} %{l_cppflags} -I`%{l_prefix}/etc/rc --query x11_incdir`" \
+    LIBS="%{l_ldflags} -L`%{l_prefix}/etc/rc --query x11_libdir`" \
+    ./configure \
+        --prefix=%{l_prefix} \
+        --with-x \
+        --x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
+        --x-libraries=`%{l_prefix}/etc/rc --query x11_libdir`
+    %{l_make} %{l_mflags}
 
 %install
     rm -rf $RPM_BUILD_ROOT