- sync some things with DEVEL for easier merging; fixed glib dependency

Changed files:
    arts.spec -> 1.49

diff --git a/arts.spec b/arts.spec
index 1334d962bade9879fdfb01198a6eb6da5a754003..8b1ce0bab39a9370a0c98df0ea1b8f96287e1677 100644 (file)
--- a/arts.spec
+++ b/arts.spec
@@ -1,6 +1,7 @@
 #
-# _with_nas            - enable NAS audio support
-# _without_alsa                - disable ALSA support
+# Conditional build:
+%bcond_without alsa    # disable ALSA support
+%bcond_with    nas     # enable NAS support
 #
 Summary:       aRts sound server
 Summary(pl):   Serwer d¼wiêku
@@ -15,7 +16,7 @@ Group:                Libraries
 Source0:       ftp://ftp.kde.org/pub/kde/stable/3.1.4/src/%{name}-%{version}.tar.bz2
 # Source0-md5: aa4bef1e80cd3795e3fd832471e348e9
 URL:           http://www.kde.org/
-%{!?_without_alsa:BuildRequires:       alsa-lib-devel}
+%{?with_alsa:BuildRequires:    alsa-lib-devel}
 BuildRequires: audiofile-devel
 BuildRequires: autoconf
 BuildRequires: automake
@@ -23,16 +24,13 @@ BuildRequires:      glib2-devel >= 2.0.0
 BuildRequires: libjpeg-devel
 BuildRequires: libmad-devel
 BuildRequires: libpng-devel
-BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:1.5-2
 BuildRequires: libvorbis-devel
-%{?_with_nas:BuildRequires:    nas-devel}
+%{?with_nas:BuildRequires:     nas-devel}
 BuildRequires: pkgconfig
 BuildRequires: qt-devel >= 3.1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _htmldir        /usr/share/doc/kde/HTML
-
 %description
 aRts sound server.
 
@@ -49,39 +47,13 @@ design foi escolhido para permitir que outras aplica
 como um sintetizador (ou fornecedor de filtros). Usado pelo KDE, entre
 outros.
 
-%package X11
-Summary:       X11 dependent part of aRts
-Summary(pl):   Czê¶æ aRts wymagaj±ca X11
-Group:         X11/Libraries
-Requires:      %{name} = %{epoch}:%{version}
-
-%description X11
-X11 dependent part of aRts.
-
-%description X11 -l pl
-Czê¶æ aRts wymagaj±ca X11.
-
-%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
-
-%description qt
-QT dependend part of aRts.
-
-%description qt -l pl
-Czê¶æ aRts wymagaj±ca QT.
-
 %package devel
 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:      qt-devel >= 3.1
 Requires:      %{name} = %{epoch}:%{version}
-%{?_with_nas:Requires: nas-devel}
+Requires:      qt-devel >= 3.1
 
 %description devel
 Header files required to compile programs using arts.
@@ -93,12 +65,24 @@ arts.
 %description devel -l pt_BR
 Arquivos para desenvolvimento com o o aRts.
 
+%package X11
+Summary:       X11 dependent part of aRts
+Summary(pl):   Czê¶æ aRts wymagaj±ca X11
+Group:         X11/Libraries
+Requires:      %{name} = %{epoch}:%{version}
+
+%description X11
+X11 dependent part of aRts.
+
+%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 >= 1.2.6
+Requires:      glib >= 2.0.0
 
 %description glib
 GLib dependend part of aRts.
@@ -106,6 +90,19 @@ GLib dependend part of aRts.
 %description glib -l pl
 Czê¶æ aRts wymagaj±ca GLib.
 
+%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
+
+%description qt
+QT dependend part of aRts.
+
+%description qt -l pl
+Czê¶æ aRts wymagaj±ca QT.
+
 %prep
 %setup -q
 
@@ -117,22 +114,20 @@ Cz
 %{__automake}
 %{__perl} admin/am_edit
 
-kde_htmldir="%{_htmldir}"; export kde_htmldir
-kde_icondir="%{_pixmapsdir}"; export kde_icondir
 %configure \
        --%{?debug:en}%{!?debug:dis}able-debug \
        --disable-rpath \
        --enable-final \
-       --with-xinerama \
-       --with%{?_without_alsa:out}-alsa
+       --with%{!?with_alsa:out}-alsa
 
-%if %{!?_with_nas:1}0
+%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
@@ -150,12 +145,12 @@ rm -rf $RPM_BUILD_ROOT
 %post  X11 -p /sbin/ldconfig
 %postun        X11 -p /sbin/ldconfig
 
-%post  qt -p /sbin/ldconfig
-%postun        qt -p /sbin/ldconfig
-
 %post  glib -p /sbin/ldconfig
 %postun        glib -p /sbin/ldconfig
 
+%post  qt -p /sbin/ldconfig
+%postun        qt -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/artscat
@@ -168,17 +163,25 @@ rm -rf $RPM_BUILD_ROOT
 %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}/libkmedia2*.so.*.*.*
-%attr(755,root,root) %{_libdir}/libmcop*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libartsflow.so.*.*.*
+%attr(755,root,root) %{_libdir}/libartsflow_idl.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.*.*.*
 # lt_dlopened modules (*.la needed)
-%attr(755,root,root) %{_libdir}/libarts*playobject.so.*.*.*
-%{_libdir}/libarts*playobject.la
 %attr(755,root,root) %{_libdir}/libartscbackend.so.*.*.*
 %{_libdir}/libartscbackend.la
-%attr(755,root,root) %{_libdir}/libartsdsp*.so.*.*.*
-%{_libdir}/libartsdsp*.la
+%attr(755,root,root) %{_libdir}/libartsdsp.so.*.*.*
+%{_libdir}/libartsdsp.la
+%attr(755,root,root) %{_libdir}/libartsdsp_st.so.*.*.*
+%{_libdir}/libartsdsp_st.la
+%attr(755,root,root) %{_libdir}/libartsgslplayobject.so.*.*.*
+%{_libdir}/libartsgslplayobject.la
+%attr(755,root,root) %{_libdir}/libartswavplayobject.so.*.*.*
+%{_libdir}/libartswavplayobject.la
+#
 %{_libdir}/mcop
 
 %files devel
@@ -186,21 +189,31 @@ rm -rf $RPM_BUILD_ROOT
 %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}/libkmedia2*.so
-%attr(755,root,root) %{_libdir}/libmcop*.so
-%attr(755,root,root) %{_libdir}/libsoundserver_idl.so
-%attr(755,root,root) %{_libdir}/libgmcop.so
-%attr(755,root,root) %{_libdir}/libqtmcop.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}/libarts*playobject.so
+%attr(755,root,root) %{_libdir}/libartsgslplayobject.so
+%attr(755,root,root) %{_libdir}/libartswavplayobject.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
+# shared libraries
 %{_libdir}/libartsc.la
-%{_libdir}/libartsflow*.la
-%{_libdir}/libkmedia2*.la
-%{_libdir}/libmcop*.la
+%{_libdir}/libartsflow.la
+%{_libdir}/libartsflow_idl.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
 %{_includedir}/artsc