Made optionals supports in many packages.

CVS patchset: 356
CVS date: 2001/07/26 19:55:12

2 files changed, 93 insertions, 11 deletions

diff --git a/misc/build_rpms.sh.in b/misc/build_rpms.sh.in
index 25302deb2..43217491c 100644
--- a/misc/build_rpms.sh.in
+++ b/misc/build_rpms.sh.in
@@ -44,9 +44,16 @@ 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'
+mv -f '/usr/src/redhat/RPMS/i386/@PACKAGE@-docs-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-docs-@SPEC_VERSION@-0.rpm'
+@HAVE_OSS_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-oss-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-oss-@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_ARTS_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-arts-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-arts-@SPEC_VERSION@-0.i686.rpm'
+@HAVE_ESD_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-esd-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-esd-@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'
+@HAVE_XV_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-xv-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-xv-@SPEC_VERSION@-0.i686.rpm'
+@HAVE_AA_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-aa-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-aa-@SPEC_VERSION@-0.i686.rpm'
+@W32DLL_DEP@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-w32dll-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-w32dll-@SPEC_VERSION@-0.i686.rpm'
 
 echo "*****************************************************"
 echo
@@ -62,9 +69,16 @@ 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'
+mv -f '/usr/src/redhat/RPMS/i386/@PACKAGE@-docs-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-docs-@SPEC_VERSION@-0.rpm'
+@HAVE_OSS_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-oss-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-oss-@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_ARTS_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-arts-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-arts-@SPEC_VERSION@-0.k6.rpm'
+@HAVE_ESD_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-esd-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-esd-@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'
+@HAVE_XV_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-xv-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-xv-@SPEC_VERSION@-0.k6.rpm'
+@HAVE_AA_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-aa-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-aa-@SPEC_VERSION@-0.k6.rpm'
+@W32DLL_DEP@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-w32dll-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-w32dll-@SPEC_VERSION@-0.k6.rpm'
 
 echo "*****************************************************"
 echo
@@ -80,9 +94,16 @@ 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'
+mv -f '/usr/src/redhat/RPMS/i386/@PACKAGE@-docs-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-docs-@SPEC_VERSION@-0.rpm'
+@HAVE_OSS_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-oss-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-oss-@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_ARTS_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-arts-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-arts-@SPEC_VERSION@-0.i586.rpm'
+@HAVE_ESD_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-esd-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-esd-@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'
+@HAVE_XV_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-xv-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-xv-@SPEC_VERSION@-0.i586.rpm'
+@HAVE_AA_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-aa-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-aa-@SPEC_VERSION@-0.i586.rpm'
+@W32DLL_DEP@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-w32dll-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-w32dll-@SPEC_VERSION@-0.i586.rpm'
 
 echo "*****************************************************"
 echo
@@ -98,8 +119,15 @@ 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'
+mv -f '/usr/src/redhat/RPMS/i386/@PACKAGE@-docs-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-docs-@SPEC_VERSION@-0.rpm'
+@HAVE_OSS_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-oss-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-oss-@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_ARTS_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-arts-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-arts-@SPEC_VERSION@-0.k7.rpm'
+@HAVE_ESD_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-esd-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-esd-@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'
+@HAVE_XV_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-xv-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-xv-@SPEC_VERSION@-0.k7.rpm'
+@HAVE_AA_TRUE@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-aa-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-aa-@SPEC_VERSION@-0.k7.rpm'
+@W32DLL_DEP@mv '/usr/src/redhat/RPMS/i386/@PACKAGE@-w32dll-@SPEC_VERSION@-0.i386.rpm' './rpms/@PACKAGE@-w32dll-@SPEC_VERSION@-0.k7.rpm'
 
 echo "Done."
diff --git a/misc/xine-lib.spec.in b/misc/xine-lib.spec.in
index 9b1ab60d1..fd3af555d 100644
--- a/misc/xine-lib.spec.in
+++ b/misc/xine-lib.spec.in
@@ -16,6 +16,11 @@ URL:         http://xine.sourceforge.net
 Packager:    Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
 BuildRoot:   /tmp/%{name}-root
 
+@HAVE_OSS_TRUE@%package oss
+@HAVE_OSS_TRUE@Summary:     XINE - oss support.
+@HAVE_OSS_TRUE@Group:       Development/Libraries
+@HAVE_OSS_TRUE@Requires:    xine-lib >= 0.5.0
+
 @HAVE_ALSA05_TRUE@%package alsa05
 @HAVE_ALSA05_TRUE@Summary:     XINE - alsa 0.5.x support.
 @HAVE_ALSA05_TRUE@Group:       Development/Libraries
@@ -31,11 +36,31 @@ BuildRoot:   /tmp/%{name}-root
 @HAVE_ARTS_TRUE@Group:       Development/Libraries
 @HAVE_ARTS_TRUE@Requires:    xine-lib >= 0.5.0
 
+@HAVE_ESD_TRUE@%package esd
+@HAVE_ESD_TRUE@Summary:     XINE - esd support.
+@HAVE_ESD_TRUE@Group:       Development/Libraries
+@HAVE_ESD_TRUE@Requires:    xine-lib >= 0.5.0, libesd
+
 @HAVE_DXR3_TRUE@%package dxr3
 @HAVE_DXR3_TRUE@Summary:     XINE - DXR3 support.
 @HAVE_DXR3_TRUE@Group:       Development/Libraries
 @HAVE_DXR3_TRUE@Requires:    xine-lib >= 0.5.0
 
+@HAVE_XV_TRUE@%package xv
+@HAVE_XV_TRUE@Summary:     XINE - XFree XVideo support.
+@HAVE_XV_TRUE@Group:       Development/Libraries
+@HAVE_XV_TRUE@Requires:    xine-lib >= 0.5.0
+
+@HAVE_AA_TRUE@%package aa
+@HAVE_AA_TRUE@Summary:     XINE - Ascii Art support.
+@HAVE_AA_TRUE@Group:       Development/Libraries
+@HAVE_AA_TRUE@Requires:    xine-lib >= 0.5.0, libaa
+
+@W32DLL_DEP@%package w32dll
+@W32DLL_DEP@Summary:     XINE - win32dll decoder support.
+@W32DLL_DEP@Group:       Development/Libraries
+@W32DLL_DEP@Requires:    xine-lib >= 0.5.0
+
 %package docs
 Summary:     XINE - html API documentation.
 Group:       Documentation
@@ -66,6 +91,9 @@ xine ´Â GPL¶óÀ̼±½º¸¦ µû¸£´Â UNIX¿ë °ø°³ µ¿¿µ»ó Ç÷¹À̾îÀÔ´Ï´Ù. ÀÌ
 Ç÷¹À̾î´Â mpeg-2 ¿Í mpeg 1 ½ºÆ®¸²À» Áö¿øÇϸç, ÇöÀç´Â Áö¿øÇÏÁö
 ¾ÊÁö¸¸ ³ªÁß¿¡´Â mpeg-4 ¿Í ´Ù¸¥ Çü½ÄÀÇ µ¿¿µ»óµµ Áö¿øÇÒ ¿¹Á¤ÀÔ´Ï´Ù.
 
+@HAVE_OSS_TRUE@%description oss
+@HAVE_OSS_TRUE@audio plugin with oss support.
+
 @HAVE_ALSA05_TRUE@%description alsa05
 @HAVE_ALSA05_TRUE@audio plugin with alsa 0.5.x support.
 
@@ -75,9 +103,21 @@ xine ´Â GPL¶óÀ̼±½º¸¦ µû¸£´Â UNIX¿ë °ø°³ µ¿¿µ»ó Ç÷¹À̾îÀÔ´Ï´Ù. ÀÌ
 @HAVE_ARTS_TRUE@%description arts
 @HAVE_ARTS_TRUE@audio plugin with arts support.
 
+@HAVE_ESD_TRUE@%description esd
+@HAVE_ESD_TRUE@audio plugin with esd support.
+
 @HAVE_DXR3_TRUE@%description dxr3
 @HAVE_DXR3_TRUE@video/decoder plugins for DXR3 card support.
 
+@HAVE_XV_TRUE@%description xv
+@HAVE_XV_TRUE@video plugin using XFree XVideo extension.
+
+@HAVE_AA_TRUE@%description aa
+@HAVE_AA_TRUE@video plugin using Ascii Art library.
+
+@W32DLL_DEP@%description w32dll
+@W32DLL_DEP@win32dll decoder support.
+
 %description docs
 HTML documentation of XINE API.
 
@@ -169,26 +209,22 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/lib/xine/plugins/xineplug_decode_mpg123.so
 %{prefix}/lib/xine/plugins/xineplug_decode_spu.la
 %{prefix}/lib/xine/plugins/xineplug_decode_spu.so
-%{prefix}/lib/xine/plugins/xineplug_decode_w32dll.la
-%{prefix}/lib/xine/plugins/xineplug_decode_w32dll.so
 # audio driver plugins
-%{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
-%{prefix}/lib/xine/plugins/xineplug_ao_out_oss.so
+# see other packages.
+#
 # video driver plugins
-%{prefix}/lib/xine/plugins/xineplug_vo_out_aa.la
-%{prefix}/lib/xine/plugins/xineplug_vo_out_aa.so
 %{prefix}/lib/xine/plugins/xineplug_vo_out_syncfb.la
 %{prefix}/lib/xine/plugins/xineplug_vo_out_syncfb.so
 %{prefix}/lib/xine/plugins/xineplug_vo_out_xshm.la
 %{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
+# lib and logo.
 %{prefix}/lib/libxine*.la
 %{prefix}/lib/libxine*.so*
 %{prefix}/share/xine/skins/*
-##%{prefix}/share/doc/xine/*
+
+@HAVE_OSS_TRUE@%files oss
+@HAVE_OSS_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_oss.la
+@HAVE_OSS_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_oss.so
 
 @HAVE_ALSA05_TRUE@%files alsa05
 @HAVE_ALSA05_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_alsa05.la
@@ -202,16 +238,34 @@ rm -rf $RPM_BUILD_ROOT
 @HAVE_ARTS_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_arts.la
 @HAVE_ARTS_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_arts.so
 
+@HAVE_ESD_TRUE@%files esd
+@HAVE_ESD_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_esd.la
+@HAVE_ESD_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_esd.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
 
+@HAVE_XV_TRUE@%files xv
+@HAVE_XV_TRUE@%{prefix}/lib/xine/plugins/xineplug_vo_out_xv.la
+@HAVE_XV_TRUE@%{prefix}/lib/xine/plugins/xineplug_vo_out_xv.so
+
+@HAVE_AA_TRUE@%files aa
+@HAVE_AA_TRUE@%{prefix}/lib/xine/plugins/xineplug_vo_out_aa.la
+@HAVE_AA_TRUE@%{prefix}/lib/xine/plugins/xineplug_vo_out_aa.so
+
+@W32DLL_DEP@%files w32dll
+@W32DLL_DEP@%{prefix}/lib/xine/plugins/xineplug_decode_w32dll.la
+@W32DLL_DEP@%{prefix}/lib/xine/plugins/xineplug_decode_w32dll.so
+
 %files docs
 %{prefix}/share/doc/xine/xine-lib-API/*
 
 %changelog
+* Thu Jul 26 2001 Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
+- Made oss, aa, xv, esd, w32dll, documentation as separate packages.
 * Thu Jul 26 2001 Matthias Dahl <matthew2k@web.de>
 - added seperate arts package and one missing demuxer plugin to filelist
 * Wed Jul 18 2001 Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>