Correctly build and install plugins as shared objects, make sure out compression tools are used, include a set of custom skins, and correctly test the operating system and hardware architecture when configuring

xmms/xmms.patch

@@ -1,5 +1,26 @@
---- libxmms/util.c.dist	2003-06-29 15:13:49.000000000 +0200
-+++ libxmms/util.c	2003-06-29 15:14:07.000000000 +0200
+diff -Naur xmms-1.2.7.orig/configure xmms-1.2.7/configure
+--- xmms-1.2.7.orig/configure	2003-08-03 00:44:27.915287000 +0200
++++ xmms-1.2.7/configure	2003-08-03 00:59:20.419469000 +0200
+@@ -11885,10 +11885,13 @@
+ 	*-hpux-*)
+ 		ARCH_DEFINES="-DHPUX"
+ 	;;
+-	*-sun-*)
+-		have_solaris=yes
+-	;;
+ esac
++case "$host_os" in
++    *solaris*)
++        have_solaris=yes
++    ;;
++esac
++
+ 
+ 
+ 
+diff -Naur xmms-1.2.7.orig/libxmms/util.c xmms-1.2.7/libxmms/util.c
+--- xmms-1.2.7.orig/libxmms/util.c	2003-08-03 00:59:03.308605000 +0200
++++ xmms-1.2.7/libxmms/util.c	2003-08-03 00:09:20.631805000 +0200
 @@ -11,6 +11,7 @@
  #endif
  
@@ -8,3 +29,31 @@
  #include <sys/sysctl.h>
  #endif
  
+diff -Naur xmms-1.2.7.orig/xmms/skin.c xmms-1.2.7/xmms/skin.c
+--- xmms-1.2.7.orig/xmms/skin.c	2003-08-03 18:41:49.234488000 +0200
++++ xmms-1.2.7/xmms/skin.c	2003-08-03 18:43:11.513838000 +0200
+@@ -562,10 +562,10 @@
+ 
+ 	unzip = getenv("UNZIPCMD");
+ 	if (!unzip)
+-		unzip = "unzip";
++		unzip = "@l_unzip@";
+ 	tar = getenv("TARCMD");
+ 	if (!tar)
+-		tar = "tar";
++		tar = "@l_tar@";
+ 
+ 	if ((ending = strrchr(path, '.')) == NULL)
+ 		return NULL;
+@@ -581,9 +581,9 @@
+ 	if (!strcasecmp(ending, ".zip") || !strcasecmp(ending, ".wsz"))
+ 		tmp = g_strdup_printf("%s >/dev/null -o -j \"%s\" -d %s", unzip, path, tempdir);
+ 	if (!strcasecmp(ending, ".tgz") || !strcasecmp(ending, ".gz"))
+-		tmp = g_strdup_printf("%s >/dev/null xzf \"%s\" -C %s", tar, path, tempdir);
++		tmp = g_strdup_printf("@l_gzip@ -dc \"%s\" | %s >/dev/null xf - -C %s", path, tar, tempdir);
+ 	if (!strcasecmp(ending, ".bz2"))
+-		tmp = g_strdup_printf("bzip2 -dc \"%s\" | %s >/dev/null xf - -C %s", path, tar, tempdir);
++		tmp = g_strdup_printf("@l_bzip2@ -dc \"%s\" | %s >/dev/null xf - -C %s", path, tar, tempdir);
+ 	if (!strcasecmp(ending, ".tar"))
+ 		tmp = g_strdup_printf("%s >/dev/null xf \"%s\" -C %s", tar, path, tempdir);
+ 

xmms/xmms.spec

@@ -33,20 +33,21 @@ Distribution: OpenPKG [EVAL]
 Group:        Audio
 License:      GPL
 Version:      1.2.7
-Release:      20030708
+Release:      20030804
 
 #   list of sources
 Source0:      http://xmms.org/files/1.2.x/xmms-%{version}.tar.bz2
+Source1:      xmmsskins.tar
 Patch0:       xmms.patch
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030708, X11
-BuildPreReq:  gtk, glib, glib::with_threads = yes
+BuildPreReq:  OpenPKG, openpkg >= 20030708, X11, gtk, libiconv
+BuildPreReq:  infozip, glib, glib::with_threads = yes
 BuildPreReq:  libxml, libmikmod, vorbis-libs
-PreReq:       OpenPKG, openpkg >= 20030708, X11
-PreReq:       gtk, glib, glib::with_threads = yes
+PreReq:       OpenPKG, openpkg >= 20030708, X11, gtk, libiconv
+PreReq:       infozip, glib, glib::with_threads = yes
 PreReq:       libxml, libmikmod, vorbis-libs
 AutoReq:      no
 AutoReqProv:  no
@@ -57,9 +58,16 @@ AutoReqProv:  no
 
 %prep
     %setup -q
-    %patch -p0
+    %patch -p1
+    %{l_shtool} subst \
+        -e 's;@l_tar@;%{l_tar};g' \
+        -e 's;@l_gzip@;%{l_gzip};g' \
+        -e 's;@l_bzip2@;%{l_bzip2};g' \
+        -e 's;@l_unzip@;%{l_prefix}/bin/unzip;g' \
+        xmms/skin.c
 
 %build
+    #   link main binaries statically
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags}" \
     CPPFLAGS="%{l_cppflags libxml2/libxml}" \
@@ -71,6 +79,7 @@ AutoReqProv:  no
         --x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
         --x-libraries=`%{l_prefix}/etc/rc --query x11_libdir` \
         --enable-static \
+        --disable-shared \
         --with-glib-prefix=%{l_prefix} \
         --with-gtk-prefix=%{l_prefix} \
         --with-libxml-prefix=%{l_prefix} \
@@ -81,15 +90,46 @@ AutoReqProv:  no
         --without-gnome \
         --disable-esd \
         --disable-nls \
-        --disable-3dnow \
-        --disable-shared
+        --disable-3dnow
     %{l_make} %{l_mflags -O}
 
+    #   link plugins as shared objects instead
+    CC="%{l_cc}" \
+    CFLAGS="%{l_cflags}" \
+    CPPFLAGS="%{l_cppflags libxml2/libxml}" \
+    LDFLAGS="%{l_ldflags}" \
+    XML_CONFIG="%{l_prefix}/bin/xml2-config" \
+    ./configure \
+        --prefix=%{l_prefix} \
+        --with-x \
+        --x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
+        --x-libraries=`%{l_prefix}/etc/rc --query x11_libdir` \
+        --disable-static \
+        --enable-shared \
+        --with-glib-prefix=%{l_prefix} \
+        --with-gtk-prefix=%{l_prefix} \
+        --with-libxml-prefix=%{l_prefix} \
+        --with-libmikmod-prefix=%{l_prefix} \
+        --enable-vorbis \
+        --with-vorbis-prefix=%{l_prefix} \
+        --with-ogg-prefix=%{l_prefix} \
+        --without-gnome \
+        --disable-esd \
+        --disable-nls \
+        --disable-3dnow
+    ( cd Input; %{l_make} %{l_mflags -O} clean all) || exit $?
+    ( cd Output; %{l_make} %{l_mflags -O} clean all) || exit $?
+    ( cd General; %{l_make} %{l_mflags -O} clean all) || exit $?
+    ( cd Effect; %{l_make} %{l_mflags -O} clean all) || exit $?
+    ( cd Visualization; %{l_make} %{l_mflags -O} clean all) || exit $?
+
 %install
     rm -rf $RPM_BUILD_ROOT
     %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
+    ( cd $RPM_BUILD_ROOT%{l_prefix}/share/xmms
+      %{l_tar} xf %{SOURCE xmmsskins.tar}
+    ) || exit $?
     rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/wmxmms
-    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/xmms/*/lib*
     rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/gnomexmms.1
     rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/wmxmms.1
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}