- sort --enable-x11 to the other x11 options - link gmplayer under with_gui and not with_win32 - use new fixed "shtool mkln" command consistently - cleanup: s/ftp1.mplayerhq.hu/ftp.mplayerhq.hu/ - remove hints to fibmap_mplayer because its Linux only anyway

mplayer/mplayer.spec

@@ -23,12 +23,6 @@
 ##  SUCH DAMAGE.
 ##
 
-#   ms: FIXME Insert the following block after install PROG to BINDIR
-#       FIXME The fibmap_mplayer allows viewing of CSS encrypted media
-#   %{l_shtool} install -s -c -o %{l_susr} -g %{l_sgrp} -m 4755 \
-#       fibmap_mplayer \
-#       $RPM_BUILD_ROOT%{l_prefix}/bin/
-
 #   package versions
 %define       V_mplayer     0.90
 %define       V_blue        1.0
@@ -51,15 +45,15 @@ Release:      20030509
 
 #   list of sources
 Source0:      ftp://ftp.mplayerhq.hu/MPlayer/releases/MPlayer-%{V_mplayer}.tar.bz2
-Source1:      ftp://ftp1.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.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
 Source4:      ftp://ftp.mplayerhq.hu/MPlayer/Skin/Blue-%{V_blue}.tar.bz2
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030103, X11, zlib, libiconv, sdl, freetype, jpeg, png, vorbis-libs, lzo
-PreReq:       OpenPKG, openpkg >= 20030103, X11, zlib, libiconv, sdl, freetype, jpeg, png, vorbis-libs
+BuildPreReq:  OpenPKG, openpkg >= 20030509, X11, zlib, libiconv, sdl, freetype, jpeg, png, vorbis-libs, lzo
+PreReq:       OpenPKG, openpkg >= 20030509, X11, zlib, libiconv, sdl, freetype, jpeg, png, vorbis-libs
 %if "%{with_gui}" == "yes"
 BuildPreReq:  glib, gtk
 %endif
@@ -77,6 +71,7 @@ AutoReqProv:  no
     %setup -q -n MPlayer-%{V_mplayer}
 
 %build
+    #   configure programs
     CC="%{l_cc}" \
     CXX="%{l_cxx}" \
     CFLAGS="%{l_cflags -O}" \
@@ -108,8 +103,8 @@ AutoReqProv:  no
         --enable-jpeg \
         --enable-png \
         --enable-sdl \
-        --enable-x11 \
         --enable-liblzo \
+        --enable-x11 \
         --with-x11incdir=`%{l_prefix}/etc/rc --query x11_incdir` \
         --with-x11libdir=`%{l_prefix}/etc/rc --query x11_libdir` \
         --with-extraincdir=%{l_prefix}/include/:%{l_prefix}/include/lzo \
@@ -128,6 +123,7 @@ AutoReqProv:  no
         ;;
     esac
 
+    #   build programs
     %{l_make} %{l_mflags -O}
 
 %install
@@ -148,17 +144,19 @@ AutoReqProv:  no
         mplayer \
         mencoder \
         $RPM_BUILD_ROOT%{l_prefix}/bin/
-%if "%{with_win32}" == "yes"
-    %{l_shtool} mkln -sf mplayer $RPM_BUILD_ROOT%{l_prefix}/bin/gmplayer
+%if "%{with_gui}" == "yes"
+    %{l_shtool} mkln -s -f \
+        $RPM_BUILD_ROOT%{l_prefix}/bin/mplayer \
+        $RPM_BUILD_ROOT%{l_prefix}/bin/gmplayer
 %endif
 
     #   install manpages
     %{l_shtool} install -c -m 644 \
         DOCS/mplayer.1 \
         $RPM_BUILD_ROOT%{l_prefix}/man/man1/
-    (  cd $RPM_BUILD_ROOT%{l_prefix}/man/man1
-       ln -sf mplayer.1 mencoder.1
-    )
+    %{l_shtool} mkln -s -f \
+        $RPM_BUILD_ROOT%{l_prefix}/man/man1/mplayer.1 \
+        $RPM_BUILD_ROOT%{l_prefix}/man/man1/mencoder.1
 
     #   install codecs configuration
     %{l_shtool} install -c -m 644 \
@@ -169,7 +167,7 @@ AutoReqProv:  no
     #   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_shtool} mkln -sf Blue default
+       %{l_shtool} mkln -s -f Blue default
     )
 %endif