- Updated to 030501 snap

- Fixed BR, Req
- Cosmetics
- Multimedia patches disabled

Changed files:
    arts.spec -> 1.25.2.13

diff --git a/arts.spec b/arts.spec
index c6f35e01e77da7575f4405b86dee8756462cd8d6..007974556b301f7e21be574ae70424e2812b2bbd 100644 (file)
--- a/arts.spec
+++ b/arts.spec
@@ -5,7 +5,7 @@
 
 %define                _state          snapshots
 %define                _ver            1.2
-%define                _snap           030428
+%define                _snap           030501
 
 Summary:       aRts sound server
 Summary(pl):   Serwer d¼wiêku
@@ -18,8 +18,8 @@ License:      LGPL
 Group:         Libraries
 #Source0:      ftp://ftp.kde.org/pub/kde/%{_state}/%{name}-%{_ver}.tar.bz2
 Source0:       http://team.pld.org.pl/~adgor/kde/%{name}-%{_snap}.tar.bz2
-Patch0:                http://rambo.its.tudelft.nl/~ewald/xine/arts-1.1.1-video-20030314.patch
-Patch1:                http://rambo.its.tudelft.nl/~ewald/xine/arts-1.1.1-streaming-20030317.patch
+#Patch0:               http://rambo.its.tudelft.nl/~ewald/xine/arts-1.1.1-video-20030314.patch
+#Patch1:               http://rambo.its.tudelft.nl/~ewald/xine/arts-1.1.1-streaming-20030317.patch
 %ifnarch sparc sparcv9 sparc64
 %{!?_without_alsa:BuildRequires:       alsa-lib-devel}
 %endif
@@ -27,18 +27,15 @@ BuildRequires:      audiofile-devel
 BuildRequires: glib2-devel >= 2.0.0
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
-# not needed, only ./configure check for this
-#BuildRequires:        libvorbis-devel
-#BuildRequires:        mad-devel
+BuildRequires: libvorbis-devel
+BuildRequires: mad-devel
 %{?_with_nas:BuildRequires:    nas-devel}
 %{!?_with_nas:BuildConflicts:  nas-devel}
 BuildRequires: pkgconfig
-BuildRequires: qt-devel >= 3.1
+BuildRequires: qt-devel >= 3.2-0.030428.1
 URL:           http://www.kde.org/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _htmldir        %{_docdir}/kde/HTML
-
 %define                no_install_post_chrpath         1
 
 %description
@@ -57,37 +54,16 @@ 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
-
-%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} >= %{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} >= %{version}
+Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-X11 = %{version}-%{release}
+Requires:      %{name}-glib = %{version}-%{release}
+Requires:      %{name}-qt = %{version}-%{release}
 
 %description devel
 Header files required to compile programs using arts.
@@ -99,6 +75,17 @@ 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
+
+%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
@@ -111,18 +98,29 @@ 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} >= %{version}
+Requires:      qt >= 3.1
+
+%description qt
+QT dependend part of aRts.
+
+%description qt -l pl
+Czê¶æ aRts wymagaj±ca QT.
+
 %prep
 %setup -q -n %{name}-%{_snap}
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1
+#%patch1 -p1
+
 %build
-kde_htmldir="%{_htmldir}"; export kde_htmldir
-kde_icondir="%{_pixmapsdir}"; export kde_icondir
 
 %configure \
        --%{?debug:en}%{!?debug:dis}able-debug \
        --enable-final \
-       --with-xinerama \
        --with%{?_without_alsa:out}-alsa
 
 %{__make}
@@ -144,7 +142,6 @@ 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
 %{_libdir}/lib[!gqx]*.la
 %attr(755,root,root) %{_libdir}/lib[!gqx]*.so.*
 %{_libdir}/mcop