This commit was manufactured by cvs2git to create tag 'snap_030613'.

Sprout from master 2003-05-16 00:16:07 UTC adgor <adgor@pld-linux.org> '- Removed modules versioning'
Cherrypick from unlabeled-1.25.2 2003-06-15 09:03:39 UTC adgor <adgor@pld-linux.org> '- 030613':
    arts.spec -> 1.25.2.26
Delete:
    arts-1.1.1-streaming-20030317.patch
    arts-1.1.1-video-20030314.patch
    arts-nonas.patch

diff --git a/arts-1.1.1-streaming-20030317.patch b/arts-1.1.1-streaming-20030317.patch
deleted file mode 100644 (file)
index c9d330b..0000000
--- a/arts-1.1.1-streaming-20030317.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- arts-1.1.1/soundserver/soundserverv2_impl.cc.orig  2003-03-17 09:24:17.000000000 +0100
-+++ arts-1.1.1/soundserver/soundserverv2_impl.cc       2003-03-17 09:19:54.000000000 +0100
-@@ -119,7 +119,36 @@
- 
-       TraderQuery query;
-       query.supports("Interface","Arts::PlayObject");
--      query.supports("MimeType", mimetype);
-+
-+      /* Parse URL protocol */
-+      string protocol;
-+
-+      unsigned int urlProto = url.find( ":/" );
-+
-+      if (urlProto != std::string::npos)
-+      {
-+              /* Remove [user[:passwd]@] */
-+              unsigned int urlAt = url.find( '@' );
-+
-+              if (urlAt++ == std::string::npos || urlAt >= urlProto)
-+              {
-+                      urlAt = 0;
-+              }
-+
-+              /* Remove [:port] */
-+              urlProto = url.find( ':', urlAt );
-+
-+              protocol = std::string( url, urlAt, (urlProto - urlAt) );
-+      }
-+
-+      if (!protocol.empty() && protocol != "file")
-+      {
-+              query.supports("Protocol", protocol);
-+      }
-+      if (mimetype != "application/octet-stream")
-+      {
-+              query.supports("MimeType", mimetype);
-+      }
- 
-       string objectType;
- 

diff --git a/arts-1.1.1-video-20030314.patch b/arts-1.1.1-video-20030314.patch
deleted file mode 100644 (file)
index 906531f..0000000
--- a/arts-1.1.1-video-20030314.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- arts-1.1.1/soundserver/kmedia2.idl.video   2003-03-14 22:08:11.000000000 +0100
-+++ arts-1.1.1/soundserver/kmedia2.idl 2003-03-14 22:29:04.000000000 +0100
-@@ -206,14 +206,23 @@
-  */
- interface VideoPlayObject {
-     /**
--     * video output window (active)
--     */
--    attribute long x11WindowId;
--    /**
-      * take a snapshot and draw it onto a pixmap
-      * returns the X11 pixmap ID or -1 on error
-      */
-     long x11Snapshot();
-+    /**
-+     * returns the current value of the property
-+     *
-+     * @param name the name of the property to return
-+     */
-+    long property(string name);
-+    /**
-+     * sets a property
-+     *
-+     * @param name the name of the property to set
-+     * @param value the new value for the property
-+     */
-+    void property(string name, long value);
- };
- 
- /**

diff --git a/arts-nonas.patch b/arts-nonas.patch
deleted file mode 100644 (file)
index a175698..0000000
--- a/arts-nonas.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- arts-1.1.1/configure.in.in.orig    Sat Mar 22 15:20:21 2003
-+++ arts-1.1.1/configure.in.in Sat Mar 22 15:27:15 2003
-@@ -167,16 +167,17 @@
-   arts_libaudionas_include=no
-   AC_CHECK_HEADER(audio/audiolib.h,
-   [
--    arts_libaudionas_include=yes
-+    arts_libaudionas_include=no
-   ])
-   if test "x$arts_libaudionas_include" = "xyes"; then
-     AC_CHECK_LIB(audio,AuOpenServer,[
-      dnl LDFLAGS in case it's in KDEDIR/lib
--     LIBAUDIONAS="$LDFLAGS -laudio -lXt"
--     AC_DEFINE(HAVE_LIBAUDIONAS, 1,
-+     LIBAUDIONAS=""
-+     AC_DEFINE(HAVE_LIBAUDIONAS, 0,
-         [Define if you have libaudio (required if you want to have NAS support)])
-    ])
-   fi
-+  
-   AC_SUBST(LIBAUDIONAS)
-   AC_LANG_RESTORE
-   CPPFLAGS="$ac_CPPFLAGS_save"

diff --git a/arts.spec b/arts.spec
index b5bfad16dadb1ed8cd20fe1c5fdd5eb7df0bdfea..0eef553dee1fde0bc9154ebbc059aa4c190f8fcd 100644 (file)
--- a/arts.spec
+++ b/arts.spec
@@ -2,35 +2,42 @@
 # _with_nas            - enable NAS audio support
 # _without_alsa                - disable ALSA support
 #
-%ifarch sparc sparcv9 sparc64
-%define                _without_alsa   1
-%endif
+
+%define                _state          snapshots
+%define                _ver            1.2
+%define                _snap           030613
+
 Summary:       aRts sound server
 Summary(pl):   Serwer d¼wiêku
 Summary(pt_BR):        Servidor de sons usado pelo KDE
 Name:          arts
-Version:       1.1.2
-Release:       1
+Version:       1.2
+Release:       0.%{_snap}.1
 Epoch:         12
 License:       LGPL
-Vendor:                The KDE Team
 Group:         Libraries
-Source0:       ftp://ftp.kde.org/pub/kde/stable/3.1.2/src/%{name}-%{version}.tar.bz2
+#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: f95356922eaf4da887a8722b0c9d8beb
+#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:                %{name}-modules.patch
+%ifnarch sparc sparcv9 sparc64
 %{!?_without_alsa:BuildRequires:       alsa-lib-devel}
+%endif
 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}
 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        /usr/share/doc/kde/HTML
+%define                no_install_post_chrpath         1
 
 %description
 aRts sound server.
@@ -48,38 +55,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}
-%{?_with_nas:Requires: nas-devel}
+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.
@@ -91,6 +76,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
@@ -103,18 +99,31 @@ 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
+%setup -q -n %{name}-%{_snap}
+%patch0 -p1
+#%patch1 -p1
 
 %build
-kde_htmldir="%{_htmldir}"; export kde_htmldir
-kde_icondir="%{_pixmapsdir}"; export kde_icondir
+
+%{__make} -f Makefile.cvs
 
 %configure \
        --%{?debug:en}%{!?debug:dis}able-debug \
-       --disable-rpath \
        --enable-final \
-       --with-xinerama \
        --with%{?_without_alsa:out}-alsa
 
 %if %{!?_with_nas:1}0
@@ -124,6 +133,7 @@ sed -e 's@#define HAVE_LIBAUDIONAS 1@/* #undef HAVE_LIBAUDIONAS */@' \
        > config.h.tmp
 mv -f config.h{.tmp,}
 %endif
+
 %{__make}
 
 %install
@@ -131,20 +141,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-%post  -p /sbin/ldconfig
-%postun        -p /sbin/ldconfig
+%clean
+rm -rf $RPM_BUILD_ROOT
 
-%post  X11 -p /sbin/ldconfig
-%postun        X11 -p /sbin/ldconfig
+%post          -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
-%post  qt -p /sbin/ldconfig
-%postun        qt -p /sbin/ldconfig
+#%post X11     -p /sbin/ldconfig
+#%postun X11   -p /sbin/ldconfig
 
-%post  glib -p /sbin/ldconfig
-%postun        glib -p /sbin/ldconfig
+%post  glib    -p /sbin/ldconfig
+%postun        glib    -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%post  qt      -p /sbin/ldconfig
+%postun        qt      -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -155,23 +165,67 @@ 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}/libartsc.la
+%attr(755,root,root) %{_libdir}/libartsc.so.*.*.*
+%{_libdir}/libartscbackend.la
+#%attr(755,root,root) %{_libdir}/libartscbackend.so.*.*.*
+%attr(755,root,root) %{_libdir}/libartscbackend.so
+%{_libdir}/libartsdsp.la
+#%attr(755,root,root) %{_libdir}/libartsdsp.so.*.*.*
+%attr(755,root,root) %{_libdir}/libartsdsp.so
+%{_libdir}/libartsdsp_st.la
+#%attr(755,root,root) %{_libdir}/libartsdsp_st.so.*.*.*
+%attr(755,root,root) %{_libdir}/libartsdsp_st.so
+%{_libdir}/libartsflow.la
+%attr(755,root,root) %{_libdir}/libartsflow.so.*.*.*
+%{_libdir}/libartsflow_idl.la
+%attr(755,root,root) %{_libdir}/libartsflow_idl.so.*.*.*
+%{_libdir}/libartsgslplayobject.la
+#%attr(755,root,root) %{_libdir}/libartsgslplayobject.so.*.*.*
+%attr(755,root,root) %{_libdir}/libartsgslplayobject.so
+%{_libdir}/libartswavplayobject.la
+#%attr(755,root,root) %{_libdir}/libartswavplayobject.so.*.*.*
+%attr(755,root,root) %{_libdir}/libartswavplayobject.so
+%{_libdir}/libkmedia2.la
+%attr(755,root,root) %{_libdir}/libkmedia2.so.*.*.*
+%{_libdir}/libkmedia2_idl.la
+%attr(755,root,root) %{_libdir}/libkmedia2_idl.so.*.*.*
+%{_libdir}/libmcop.la
+%attr(755,root,root) %{_libdir}/libmcop.so.*.*.*
+%{_libdir}/libmcop_mt.la
+%attr(755,root,root) %{_libdir}/libmcop_mt.so.*.*.*
+%{_libdir}/libsoundserver_idl.la
+%attr(755,root,root) %{_libdir}/libsoundserver_idl.so.*.*.*
 %{_libdir}/mcop
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/artsc-config
 %attr(755,root,root) %{_bindir}/mcopidl
-%{_libdir}/*.so
+%{_libdir}/libartsc.so
+#%{_libdir}/libartscbackend.so
+#%{_libdir}/libartsdsp.so
+#%{_libdir}/libartsdsp_st.so
+%{_libdir}/libartsflow.so
+%{_libdir}/libartsflow_idl.so
+#%{_libdir}/libartsgslplayobject.so
+#%{_libdir}/libartswavplayobject.so
+%{_libdir}/libkmedia2.so
+%{_libdir}/libkmedia2_idl.so
+%{_libdir}/libgmcop.so
+%{_libdir}/libmcop.so
+%{_libdir}/libmcop_mt.so
+%{_libdir}/libqtmcop.so
+%{_libdir}/libsoundserver_idl.so
+#%{_libdir}/libx11globalcomm.so
 %{_includedir}/arts
 %{_includedir}/artsc
 
 %files X11
 %defattr(644,root,root,755)
 %{_libdir}/libx11globalcomm.la
-%attr(755,root,root) %{_libdir}/libx11globalcomm.so.*.*.*
+#%attr(755,root,root) %{_libdir}/libx11globalcomm.so.*.*.*
+%attr(755,root,root) %{_libdir}/libx11globalcomm.so
 
 %files glib
 %defattr(644,root,root,755)