split xine-lib package in 4 pieces: xine-lib itself, xine-lib-alsa05,

xine-lib-alsa09 and xine-lib-dxr3. (last three are optional).

CVS patchset: 333
CVS date: 2001/07/24 10:24:31

2 files changed, 59 insertions, 15 deletions

diff --git a/misc/build_rpms.sh.in b/misc/build_rpms.sh.in
index 065e65ce4..25302deb2 100644
--- a/misc/build_rpms.sh.in
+++ b/misc/build_rpms.sh.in
@@ -14,18 +14,18 @@ if [ `expr $RPMVERSION` -lt 100 ]; then
 fi
 
 if [ `expr $RPMVERSION` -lt 400 ]; then
-  RPM_BA="rpm -ba -ta ./@PACKAGE@_@VERSION@.tar.gz"
-  RPM_BB="rpm -bb -ta ./@PACKAGE@_@VERSION@.tar.gz"
+  RPM_BA="rpm -ba -ta ./@PACKAGE@-@VERSION@.tar.gz"
+  RPM_BB="rpm -bb -ta ./@PACKAGE@-@VERSION@.tar.gz"
 else
-  RPM_BA="rpm -ta ./@PACKAGE@_@VERSION@.tar.gz -ba"
-  RPM_BB="rpm -ta ./@PACKAGE@_@VERSION@.tar.gz -bb"
+  RPM_BA="rpm -ta ./@PACKAGE@-@VERSION@.tar.gz -ba"
+  RPM_BB="rpm -ta ./@PACKAGE@-@VERSION@.tar.gz -bb"
 fi
 
 ##VERSION="@XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@"
 
 echo "Creating tarball..."
 rm -f config.cache && ./cvscompile.sh && make dist
-mv -f @TAR_NAME@.tar.gz  @PACKAGE@_@VERSION@.tar.gz
+##mv -f @TAR_NAME@.tar.gz  @PACKAGE@-@VERSION@.tar.gz
 rm -rf rpms
 mkdir rpms
 
@@ -44,6 +44,9 @@ eval $RPM_BA
 
 cp '/usr/src/redhat/SRPMS/@PACKAGE@-@SPEC_VERSION@-0.src.rpm' ./rpms/
 mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-@SPEC_VERSION@-0.i686.rpm'
+@HAVE_ALSA05_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-alsa05-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-alsa05-@SPEC_VERSION@-0.i686.rpm'
+@HAVE_ALSA09_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-alsa09-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-alsa09-@SPEC_VERSION@-0.i686.rpm'
+@HAVE_DXR3_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-drx3-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-dxr3-@SPEC_VERSION@-0.i686.rpm'
 
 echo "*****************************************************"
 echo
@@ -59,6 +62,9 @@ export XINE_BUILD=k6-pc-linux-gnu
 eval $RPM_BB
 
 mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-@SPEC_VERSION@-0.k6.rpm'
+@HAVE_ALSA05_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-alsa05-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-alsa05-@SPEC_VERSION@-0.k6.rpm'
+@HAVE_ALSA09_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-alsa09-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-alsa09-@SPEC_VERSION@-0.k6.rpm'
+@HAVE_DXR3_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-drx3-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-dxr3-@SPEC_VERSION@-0.k6.rpm'
 
 echo "*****************************************************"
 echo
@@ -74,6 +80,9 @@ export XINE_BUILD=i586-pc-linux-gnu
 eval $RPM_BB
 
 mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-@SPEC_VERSION@-0.i586.rpm'
+@HAVE_ALSA05_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-alsa05-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-alsa05-@SPEC_VERSION@-0.i586.rpm'
+@HAVE_ALSA09_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-alsa09-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-alsa09-@SPEC_VERSION@-0.i586.rpm'
+@HAVE_DXR3_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-drx3-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-dxr3-@SPEC_VERSION@-0.i586.rpm'
 
 echo "*****************************************************"
 echo
@@ -89,5 +98,8 @@ export XINE_BUILD=athlon-pc-linux-gnu
 eval $RPM_BB
 
 mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-@SPEC_VERSION@-0.k7.rpm'
+@HAVE_ALSA05_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-alsa05-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-alsa05-@SPEC_VERSION@-0.k7.rpm'
+@HAVE_ALSA09_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-alsa09-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-alsa09-@SPEC_VERSION@-0.k7.rpm'
+@HAVE_DXR3_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-drx3-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-dxr3-@SPEC_VERSION@-0.k7.rpm'
 
 echo "Done."
diff --git a/misc/xine-lib.spec.in b/misc/xine-lib.spec.in
index 2e2b1648e..bd1e63dc9 100644
--- a/misc/xine-lib.spec.in
+++ b/misc/xine-lib.spec.in
@@ -11,11 +11,26 @@ Version:     %{ver}
 Release:     %{rel}
 Copyright:   GPL
 Group:       Applications/X11
-Source:      http://xine.sourceforge.net/files/@PACKAGE@_@VERSION@.tar.gz
+Source:      http://xine.sourceforge.net/files/@PACKAGE@-@VERSION@.tar.gz
 URL:         http://xine.sourceforge.net
 Packager:    Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
 BuildRoot:   /tmp/%{name}-root
 
+@HAVE_ALSA05_TRUE@%package alsa05
+@HAVE_ALSA05_TRUE@Summary:     XINE - alsa 0.5.x support.
+@HAVE_ALSA05_TRUE@Group:       Applications/X11
+@HAVE_ALSA05_TRUE@Requires:    xine-lib >= 0.5.0
+
+@HAVE_ALSA09_TRUE@%package alsa09
+@HAVE_ALSA09_TRUE@Summary:     XINE - alsa >= 0.9.x support.
+@HAVE_ALSA09_TRUE@Group:       Applications/X11
+@HAVE_ALSA09_TRUE@Requires:    xine-lib >= 0.5.0
+
+@HAVE_DXR3_TRUE@%package dxr3
+@HAVE_DXR3_TRUE@Summary:     XINE - DXR3 support.
+@HAVE_DXR3_TRUE@Group:       Applications/X11
+@HAVE_DXR3_TRUE@Requires:    xine-lib >= 0.5.0
+
 %description
 xine is a free gpl-licensed video player for unix-like systems.
 We support mpeg-2 and mpeg-1 system (audio + video multiplexed) streams,
@@ -42,6 +57,15 @@ xine ´Â GPL¶óÀ̼±½º¸¦ µû¸£´Â UNIX¿ë °ø°³ µ¿¿µ»ó Ç÷¹À̾îÀÔ´Ï´Ù. ÀÌ
 Ç÷¹À̾î´Â mpeg-2 ¿Í mpeg 1 ½ºÆ®¸²À» Áö¿øÇϸç, ÇöÀç´Â Áö¿øÇÏÁö
 ¾ÊÁö¸¸ ³ªÁß¿¡´Â mpeg-4 ¿Í ´Ù¸¥ Çü½ÄÀÇ µ¿¿µ»óµµ Áö¿øÇÒ ¿¹Á¤ÀÔ´Ï´Ù.
 
+@HAVE_ALSA05_TRUE@%description alsa05
+@HAVE_ALSA05_TRUE@audio plugin with alsa 0.5.x support.
+
+@HAVE_ALSA09_TRUE@%description alsa09
+@HAVE_ALSA09_TRUE@audio plugin with alsa >= 0.9.x support.
+
+@HAVE_DXR3_TRUE@%description dxr3
+@HAVE_DXR3_TRUE@video/decoder plugins for DXR3 card support.
+
 %prep
 %setup -n @TAR_NAME@
 
@@ -103,13 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/lib/xine/plugins/xineplug_decode_spu.so
 %{prefix}/lib/xine/plugins/xineplug_decode_w32dll.la
 %{prefix}/lib/xine/plugins/xineplug_decode_w32dll.so
-@HAVE_DXR3_TRUE@%{prefix}/lib/xine/plugins/xineplug_decode_dxr3.la
-@HAVE_DXR3_TRUE@%{prefix}/lib/xine/plugins/xineplug_decode_dxr3.so
 # audio driver plugins
-@HAVE_ALSA05_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_alsa05.la
-@HAVE_ALSA05_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_alsa05.so
-@HAVE_ALSA09_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_alsa.la
-@HAVE_ALSA09_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_alsa.so
 %{prefix}/lib/xine/plugins/xineplug_ao_out_esd.la
 %{prefix}/lib/xine/plugins/xineplug_ao_out_esd.so
 %{prefix}/lib/xine/plugins/xineplug_ao_out_oss.la
@@ -123,12 +141,26 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/lib/xine/plugins/xineplug_vo_out_xshm.so
 %{prefix}/lib/xine/plugins/xineplug_vo_out_xv.la
 %{prefix}/lib/xine/plugins/xineplug_vo_out_xv.so
-@HAVE_DXR3_TRUE@%{prefix}/lib/xine/plugins/xineplug_vo_out_dxr3.la
-@HAVE_DXR3_TRUE@%{prefix}/lib/xine/plugins/xineplug_vo_out_dxr3.so
 %{prefix}/lib/libxine*.la
 %{prefix}/lib/libxine*.so*
 %{prefix}/share/xine/skins/*
-%{prefix}/share/doc/xine/*
+##%{prefix}/share/doc/xine/*
+
+@HAVE_ALSA05_TRUE@%files alsa05
+@HAVE_ALSA05_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_alsa05.la
+@HAVE_ALSA05_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_alsa05.so
+
+@HAVE_ALSA09_TRUE@%files alsa09
+@HAVE_ALSA09_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_alsa.la
+@HAVE_ALSA09_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_alsa.so
+
+
+@HAVE_DXR3_TRUE@%files dxr3
+@HAVE_DXR3_TRUE@%{prefix}/lib/xine/plugins/xineplug_decode_dxr3.la
+@HAVE_DXR3_TRUE@%{prefix}/lib/xine/plugins/xineplug_decode_dxr3.so
+@HAVE_DXR3_TRUE@%{prefix}/lib/xine/plugins/xineplug_vo_out_dxr3.la
+@HAVE_DXR3_TRUE@%{prefix}/lib/xine/plugins/xineplug_vo_out_dxr3.so
+
 
 %changelog
 * Wed Jul 18 2001 Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>