- Merged DEVEL

Changed files:
    arts.spec -> 1.50

diff --git a/arts.spec b/arts.spec
index 8b1ce0bab39a9370a0c98df0ea1b8f96287e1677..42e0084977fa84805bb3574ccc180f4b00dfa74b 100644 (file)
--- a/arts.spec
+++ b/arts.spec
@@ -1,34 +1,44 @@
 #
+# TODO: consider:
+# - separating artsc and its -devel? (but what are artsc deps?)
+#
 # Conditional build:
 %bcond_without alsa    # disable ALSA support
 %bcond_with    nas     # enable NAS support
 #
+
+%define                _state          snapshots
+%define                _ver            1.2.0
+%define                _snap           031204
+
 Summary:       aRts sound server
 Summary(pl):   Serwer d¼wiêku
 Summary(pt_BR):        Servidor de sons usado pelo KDE
 Name:          arts
-Version:       1.1.4
+Version:       %{_ver}.%{_snap}
 Release:       1
 Epoch:         12
 License:       LGPL
-Vendor:                The KDE Team
 Group:         Libraries
-Source0:       ftp://ftp.kde.org/pub/kde/stable/3.1.4/src/%{name}-%{version}.tar.bz2
-# Source0-md5: aa4bef1e80cd3795e3fd832471e348e9
+#Source0:      ftp://ftp.kde.org/pub/kde/%{_state}/%{name}-%{_ver}.tar.bz2
+Source0:       http://www.kernel.pl/~adgor/kde/%{name}-%{_snap}.tar.bz2
+# Source0-md5: ed23773940e2b97e31a6850e2334bfe5
 URL:           http://www.kde.org/
 %{?with_alsa:BuildRequires:    alsa-lib-devel}
 BuildRequires: audiofile-devel
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: docbook-dtd41-sgml
+BuildRequires: docbook-utils
+BuildRequires: esound-devel
 BuildRequires: glib2-devel >= 2.0.0
-BuildRequires: libjpeg-devel
 BuildRequires: libmad-devel
-BuildRequires: libpng-devel
 BuildRequires: libtool >= 2:1.5-2
 BuildRequires: libvorbis-devel
 %{?with_nas:BuildRequires:     nas-devel}
 BuildRequires: pkgconfig
-BuildRequires: qt-devel >= 3.1
+BuildRequires: qt-devel >= 6:3.2.1-4
+Obsoletes:     arts-glib
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -52,8 +62,15 @@ Summary:     Sound server - header files
 Summary(pl):   Serwer d¼wiêku - pliki nag³ówkowe
 Summary(pt_BR):        Arquivos para desenvolvimento com o o aRts
 Group:         Development/Libraries
-Requires:      %{name} = %{epoch}:%{version}
-Requires:      qt-devel >= 3.1
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+# not necessary for all libs (e.g. mcop), but propagated by artsflow
+%{?with_alsa:Requires: alsa-lib-devel}
+Requires:      audiofile-devel
+Requires:      esound-devel
+Requires:      glib2-devel >= 2.0.0
+Requires:      libmad-devel
+Requires:      libvorbis-devel
+%{?with_nas:Requires:  nas-devel}
 
 %description devel
 Header files required to compile programs using arts.
@@ -65,69 +82,78 @@ arts.
 %description devel -l pt_BR
 Arquivos para desenvolvimento com o o aRts.
 
+# separate from arts-devel because they are mostly independent and have very
+# different deps
+# there is no artsc base - it would be small and would require arts - so there
+# is no reason to separate
+%package -n artsc-devel
+Summary:       Development files for artsc libraries
+Summary(pl):   Pliki programistyczne bibliotek artsc
+Group:         Development/Libraries
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      glib2-devel >= 2.0.0
+Conflicts:     arts-devel < 12:1.2.0.031126-2
+
+%description -n artsc-devel
+Development files for artsc libraries (C interface to aRts sound
+system).
+
+%description -n artsc-devel -l pl
+Pliki programistyczne bibliotek artsc (interfejsu w C do systemu
+d¼wiêku aRts).
+
 %package X11
 Summary:       X11 dependent part of aRts
 Summary(pl):   Czê¶æ aRts wymagaj±ca X11
 Group:         X11/Libraries
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description X11
-X11 dependent part of aRts.
+X11 dependent part of aRts (x11globalcomm module).
 
 %description X11 -l pl
-Czê¶æ aRts wymagaj±ca X11.
-
-%package glib
-Summary:       GLib dependend part of aRts
-Summary(pl):   Czê¶æ aRts wymagaj±ca GLib
-Group:         Libraries
-Requires:      %{name} = %{epoch}:%{version}
-Requires:      glib >= 2.0.0
-
-%description glib
-GLib dependend part of aRts.
-
-%description glib -l pl
-Czê¶æ aRts wymagaj±ca GLib.
+Czê¶æ aRts wymagaj±ca X11 (modu³ x11globalcomm).
 
 %package qt
 Summary:       QT dependend part of aRts
 Summary(pl):   Czê¶æ aRts wymagaj±ca QT
 Group:         X11/Libraries
-Requires:      %{name} = %{epoch}:%{version}
-Requires:      qt >= 3.1
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      qt >= 6:3.2.1-4
 
 %description qt
-QT dependend part of aRts.
+QT dependend part of aRts (qtmcop library).
 
 %description qt -l pl
-Czê¶æ aRts wymagaj±ca QT.
+Czê¶æ aRts wymagaj±ca QT (biblioteka qtmcop).
+
+%package qt-devel
+Summary:       Development files for qtmcop library
+Summary(pl):   Pliki programistyczne dla biblioteki qtmcop
+Group:         X11/Development/Libraries
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
+Requires:      %{name}-qt = %{epoch}:%{version}-%{release}
+Requires:      qt-devel >= 6:3.2.1-4
+
+%description qt-devel
+Development files for qtmcop library.
+
+%description qt-devel -l pl
+Pliki programistyczne dla biblioteki qtmcop.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{_snap}
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%{__perl} admin/am_edit
+%{__make} -f admin/Makefile.common cvs
 
 %configure \
+       %{!?with_nas:ac_cv_header_audio_audiolib_h=no} \
        --%{?debug:en}%{!?debug:dis}able-debug \
        --disable-rpath \
        --enable-final \
        --with%{!?with_alsa:out}-alsa
 
-%if %{without nas}
-# Cannot patch configure.in because it does not rebuild correctly on ac25
-sed -e 's@#define HAVE_LIBAUDIONAS 1@/* #undef HAVE_LIBAUDIONAS */@' \
-       < config.h \
-       > config.h.tmp
-mv -f config.h{.tmp,}
-%endif
-
 %{__make}
 
 %install
@@ -136,6 +162,16 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# Debian manpages
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
+cd debian
+for f in *.sgml ; do
+       base="$(basename $f .sgml)"
+       upper="$(echo ${base} | tr a-z A-Z)"
+       db2man $f
+       install ${upper}.1 $RPM_BUILD_ROOT%{_mandir}/man1/${base}.1
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -145,9 +181,6 @@ rm -rf $RPM_BUILD_ROOT
 %post  X11 -p /sbin/ldconfig
 %postun        X11 -p /sbin/ldconfig
 
-%post  glib -p /sbin/ldconfig
-%postun        glib -p /sbin/ldconfig
-
 %post  qt -p /sbin/ldconfig
 %postun        qt -p /sbin/ldconfig
 
@@ -160,11 +193,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/artsrec
 %attr(755,root,root) %{_bindir}/artsshell
 %attr(755,root,root) %{_bindir}/artswrapper
-%attr(755,root,root) %{_bindir}/testdhandle
 # shared libraries
 %attr(755,root,root) %{_libdir}/libartsc.so.*.*.*
 %attr(755,root,root) %{_libdir}/libartsflow.so.*.*.*
 %attr(755,root,root) %{_libdir}/libartsflow_idl.so.*.*.*
+%attr(755,root,root) %{_libdir}/libgmcop.so.*.*.*
 %attr(755,root,root) %{_libdir}/libkmedia2.so.*.*.*
 %attr(755,root,root) %{_libdir}/libkmedia2_idl.so.*.*.*
 %attr(755,root,root) %{_libdir}/libmcop.so.*.*.*
@@ -183,39 +216,53 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libartswavplayobject.la
 #
 %{_libdir}/mcop
+%{_mandir}/man1/artscat.1*
+%{_mandir}/man1/artsd.1*
+%{_mandir}/man1/artsdsp.1*
+%{_mandir}/man1/artsplay.1*
+%{_mandir}/man1/artsrec.1*
+%{_mandir}/man1/artsshell.1*
+%{_mandir}/man1/artswrapper.1*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/artsc-config
 %attr(755,root,root) %{_bindir}/mcopidl
-%attr(755,root,root) %{_libdir}/libartsc.so
 %attr(755,root,root) %{_libdir}/libartsflow.so
 %attr(755,root,root) %{_libdir}/libartsflow_idl.so
-# some apps (incorrectly?) link with libarts*playobject (gg with -lartswavplayobject only?)
 %attr(755,root,root) %{_libdir}/libartsgslplayobject.so
 %attr(755,root,root) %{_libdir}/libartswavplayobject.so
+%attr(755,root,root) %{_libdir}/libgmcop.so
 %attr(755,root,root) %{_libdir}/libkmedia2.so
 %attr(755,root,root) %{_libdir}/libkmedia2_idl.so
 %attr(755,root,root) %{_libdir}/libmcop.so
 %attr(755,root,root) %{_libdir}/libmcop_mt.so
 %attr(755,root,root) %{_libdir}/libsoundserver_idl.so
+# it seems to be only (lt_)dlopened, nothing links with it - so not needed
+# %attr(755,root,root) %{_libdir}/libx11globalcomm.so
 # shared libraries
-%{_libdir}/libartsc.la
 %{_libdir}/libartsflow.la
 %{_libdir}/libartsflow_idl.la
+%{_libdir}/libgmcop.la
 %{_libdir}/libkmedia2.la
 %{_libdir}/libkmedia2_idl.la
 %{_libdir}/libmcop.la
 %{_libdir}/libmcop_mt.la
 %{_libdir}/libsoundserver_idl.la
-# devel for -glib and -qt
-%attr(755,root,root) %{_libdir}/libgmcop.so
-%attr(755,root,root) %{_libdir}/libqtmcop.so
-%{_libdir}/libgmcop.la
-%{_libdir}/libqtmcop.la
 #
 %{_includedir}/arts
+%exclude %{_includedir}/arts/qiomanager.h
+%{_mandir}/man1/mcopidl.1*
+
+%files -n artsc-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/artsc-config
+%attr(755,root,root) %{_libdir}/libartsc.so
+%attr(755,root,root) %{_libdir}/libartscbackend.so
+%attr(755,root,root) %{_libdir}/libartsdsp.so
+%attr(755,root,root) %{_libdir}/libartsdsp_st.so
+%{_libdir}/libartsc.la
 %{_includedir}/artsc
+%{_mandir}/man1/artsc-config.1*
 
 %files X11
 %defattr(644,root,root,755)
@@ -223,12 +270,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libx11globalcomm.so.*.*.*
 %{_libdir}/libx11globalcomm.la
 
-%files glib
-%defattr(644,root,root,755)
-# shared library
-%attr(755,root,root) %{_libdir}/libgmcop.so.*.*.*
-
 %files qt
 %defattr(644,root,root,755)
 # shared library
 %attr(755,root,root) %{_libdir}/libqtmcop.so.*.*.*
+
+%files qt-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libqtmcop.so
+%{_libdir}/libqtmcop.la
+%{_includedir}/arts/qiomanager.h