cleanup packaging: fix dependencies, use newer win32 codecs, etc

mplayer/mplayer.spec

@@ -23,9 +23,11 @@
 ##
 
 #   package versions
-%define       V_mplayer     1.0pre7
-%define       V_blue        1.4
-%define       V_live        2005.07.15
+%define       V_mplayer          1.0pre7
+%define       V_codecs_essential 20050412
+%define       V_codecs_quicktime 20040704
+%define       V_skin_blue        1.4
+%define       V_extension_live   2005.08.09
 
 #   package information
 Name:         mplayer
@@ -38,19 +40,18 @@ Class:        EVAL
 Group:        Video
 License:      GPL and others
 Version:      %{V_mplayer}
-Release:      20050719
+Release:      20050814
 
 #   build options
 %option       with_gui    yes
 %option       with_win32  yes
 
 #   list of sources
-Source0:      ftp://ftp.mplayerhq.hu/MPlayer/releases/MPlayer-%{V_mplayer}.tar.bz2
-Source1:      ftp://ftp.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-Source2:      ftp://ftp.mplayerhq.hu/MPlayer/releases/codecs/win32codecs.tar.bz2
-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
+Source0:      ftp://ftp2.mplayerhq.hu/MPlayer/releases/MPlayer-%{V_mplayer}.tar.bz2
+Source1:      ftp://ftp2.mplayerhq.hu/MPlayer/releases/codecs/windows-essential-%{V_codecs_essential}.zip
+Source2:      ftp://ftp2.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
+Source3:      ftp://ftp2.mplayerhq.hu/MPlayer/Skin/Blue-%{V_skin_blue}.tar.bz2
+Source4:      http://www.live.com/liveMedia/public/live.%{V_extension_live}.tar.gz
 Patch0:       mplayer.patch
 
 #   build information
@@ -58,8 +59,8 @@ Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20040130, X11, gcc, make, sed
 PreReq:       OpenPKG, openpkg >= 20040130, X11
-BuildPreReq:  zlib, libiconv, sdl, freetype, jpeg, png, vorbis-libs, lzo, libsmbclient
-PreReq:       zlib, libiconv, sdl, freetype, jpeg, png, vorbis-libs, lzo, libsmbclient
+BuildPreReq:  zlib, libiconv, sdl, freetype, jpeg, png, vorbis-libs, lzo, libsmbclient, aalib
+PreReq:       zlib, libiconv, sdl, freetype, jpeg, png, vorbis-libs, lzo, libsmbclient, aalib
 %if "%{with_gui}" == "yes"
 BuildPreReq:  glib, gtk
 PreReq:       glib, gtk
@@ -77,24 +78,29 @@ AutoReqProv:  no
 %track
     prog mplayer = {
         version   = %{V_mplayer}
-        url       = ftp://ftp.mplayerhq.hu/MPlayer/releases/
+        url       = ftp://ftp2.mplayerhq.hu/MPlayer/releases/
         regex     = MPlayer-(__VER__)\.tar\.bz2
     }
-    prog mplayer:blue = {
-        version   = %{V_blue}
-        url       = ftp://ftp.mplayerhq.hu/MPlayer/Skin/
+    prog mplayer:codecs_essential = {
+        version   = %{V_codecs_essential}
+        url       = ftp://ftp2.mplayerhq.hu/MPlayer/releases/codecs/
+        regex     = windows-essential-(__VER__)\.tar\.bz2
+    }
+    prog mplayer:skin_blue = {
+        version   = %{V_skin_blue}
+        url       = ftp://ftp2.mplayerhq.hu/MPlayer/Skin/
         regex     = Blue-(__VER__)\.tar\.bz2
     }
-    prog mplayer:live = {
+    prog mplayer:extension_live = {
         comment   = "rse: new snapshots occur every second day, no need to upgrade such fast"
-        version   = %{V_live}
+        version   = %{V_extension_live}
         url       = http://www.live.com/liveMedia/public/
         regex     = live\.(200\d\.\d+\.\d?[02468])\.tar\.gz
     }
 
 %prep
     %setup -q -n MPlayer-%{V_mplayer}
-    %setup -q -n MPlayer-%{V_mplayer} -T -D -a 5
+    %setup -q -n MPlayer-%{V_mplayer} -T -D -a 4
     %patch -p0
     %{l_shtool} subst \
         -e 's; *-I/usr/local/include/*[a-zA-Z0-9{},/ ]*;;g' \
@@ -143,7 +149,7 @@ AutoReqProv:  no
     ./configure \
         --prefix=%{l_prefix} \
         --confdir=%{l_prefix}/etc/mplayer/ \
-        --with-codecsdir=%{l_prefix}/libexec/mplayer/nativecodecs/ \
+        --with-codecsdir=%{l_prefix}/libexec/mplayer/codecs/ \
 %if "%{with_gui}" == "yes"
         --enable-gui \
         --with-glib-config=%{l_prefix}/bin/glib-config \
@@ -152,7 +158,7 @@ AutoReqProv:  no
         --disable-gui \
 %endif
 %if "%{with_win32}" == "yes"
-        --with-win32libdir=%{l_prefix}/libexec/mplayer/win32codecs \
+        --with-win32libdir=%{l_prefix}/libexec/mplayer/codecs/win32 \
         --enable-win32 \
         --enable-qtx \
 %else
@@ -214,7 +220,7 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/share/mplayer/Skin \
 %endif
         $RPM_BUILD_ROOT%{l_prefix}/share/mplayer/font \
-        $RPM_BUILD_ROOT%{l_prefix}/libexec/mplayer/nativecodecs
+        $RPM_BUILD_ROOT%{l_prefix}/libexec/mplayer/codecs
 
     #   install binaries
     %{l_shtool} install -s -c -m 755 \
@@ -247,7 +253,7 @@ AutoReqProv:  no
 %if "%{with_gui}" == "yes"
     #   install a default skin
     ( cd $RPM_BUILD_ROOT%{l_prefix}/share/mplayer/Skin
-      %{l_bzip2} -dc %{SOURCE Blue-%{V_blue}.tar.bz2} | %{l_tar} -xvf -
+      %{l_bzip2} -dc %{SOURCE Blue-%{V_skin_blue}.tar.bz2} | %{l_tar} -xvf -
       %{l_shtool} mkln -s -f Blue default
     ) || exit $?
 %endif
@@ -259,12 +265,12 @@ AutoReqProv:  no
 
 %if "%{with_win32}" == "yes"
     #   install win32 and quicktime codecs
-    ( %{l_shtool} mkdir -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/libexec/mplayer
-      cd $RPM_BUILD_ROOT%{l_prefix}/libexec/mplayer
-      %{l_bzip2} -dc %{SOURCE win32codecs.tar.bz2} | %{l_tar} -xvf -
+    ( %{l_shtool} mkdir -p -m 755 \
+          $RPM_BUILD_ROOT%{l_prefix}/libexec/mplayer/codecs
+      cd $RPM_BUILD_ROOT%{l_prefix}/libexec/mplayer/codecs
+      %{l_prefix}/bin/unzip -x %{SOURCE windows-essential-%{V_codecs_essential}.zip}
+      mv windows-essential-%{V_codecs_essential} win32
     ) || exit $?
-    %{l_bzip2} -dc %{SOURCE qt5dlls.tar.bz2} | %{l_tar} -xvf -
-    mv -f qt5dlls/* $RPM_BUILD_ROOT%{l_prefix}/libexec/mplayer/win32codecs/
 %endif
 
     #   determine installation files