rpms/arts/F-9 .cvsignore, 1.31, 1.32 arts.spec, 1.86, 1.87 sources, 1.34, 1.35

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/arts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10787/F-9

Modified Files:
	.cvsignore arts.spec sources 
Log Message:
Sync from devel:

* Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> 8:1.5.10-1
- arts-1.5.10

* Thu May 15 2008 Rex Dieter <rdieter at fedoraproject.org> 8:1.5.9-3
- arts support for mixed multilib usage (#444484)
- f10+: drop optional esd, jack, nas support


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arts/F-9/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	14 Feb 2008 13:33:28 -0000	1.31
+++ .cvsignore	30 Aug 2008 14:27:08 -0000	1.32
@@ -1 +1 @@
-arts-1.5.9.tar.bz2
+arts-1.5.10.tar.bz2


Index: arts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arts/F-9/arts.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- arts.spec	12 Mar 2008 12:47:15 -0000	1.86
+++ arts.spec	30 Aug 2008 14:27:08 -0000	1.87
@@ -1,16 +1,33 @@
 
+%define _default_patch_fuzz 2
+
 %define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparc sparc64
 
 %define final 1 
-%define qt_version 3.3.8
 %define make_cvs 1
 
+%if 0%{?fedora} < 10
+%define _with_esd --with-esd
+%define _with_nas --with-nas
+%if 0%{?rhel} == 0
+%define _with_jack --with-jack
+%endif
+%endif
+
+%if 0%{?fedora} > 8
+%define qt3 qt3
+%else
+%define qt3 qt
+%define qt3_epoch 1:
+%endif
+%define qt3_ev %{?qt3_epoch}3.3.8
+
 Name:    arts
 Summary: aRts (analog realtime synthesizer) - the KDE sound system 
 Group:   System Environment/Daemons
 Epoch:   8
-Version: 1.5.9
-Release: 2%{?dist}
+Version: 1.5.10
+Release: 1%{?dist}
 
 License: LGPLv2+
 Url: http://www.kde.org
@@ -29,22 +46,21 @@
 Patch51: kde-3.5-libtool-shlibext.patch
 # upstream patches
 
+
 # used in artsdsp
 Requires: which
 
-BuildRequires: qt3-devel
+BuildRequires: %{qt3}-devel >= %{qt3_ev}
 ## Shouldn't be necessary, but some folks won't upgrade, unless we stiff-arm them.  (-;
-#global qt3_ver %(pkg-config qt-mt --modversion 2>/dev/null || echo %{qt_version})
-#Requires: qt3 >= 1:%{qt3_ver}
+#global qt3_ver %(pkg-config qt-mt --modversion 2>/dev/null || echo %{qt3_ev})
+#Requires: %{qt3} >= %{qt3_ver}
 BuildRequires: alsa-lib-devel
 BuildRequires: glib2-devel
 BuildRequires: libvorbis-devel
 BuildRequires: audiofile-devel
-BuildRequires: esound-devel
-%if 0%{?fedora} > 4
-BuildRequires: jack-audio-connection-kit-devel
-%endif
-BuildRequires: nas-devel
+%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
+%{?_with_esd:BuildRequires: esound-devel}
+%{?_with_nas:BuildRequires: nas-devel}
 BuildRequires: findutils sed
 %if %{make_cvs}
 BuildRequires: automake libtool
@@ -71,8 +87,7 @@
 Requires: pkgconfig
 Requires: glib2-devel
 %description devel
-Install arts-devel if you intend to write applications using arts (such as
-KDE applications using sound).
+Install %{name}-devel if you intend to write applications using aRts.
 
 
 %prep
@@ -102,7 +117,11 @@
   --disable-dependency-tracking \
   --enable-new-ldflags \
   --disable-libmad \
-%if %{final}
+  --with-alsa \
+  %{?_with_esd} %{!?_with_esd:--without-esd} \
+  %{?_with_jack} %{!?_with_jack:--without-jack}\
+  %{?_with_nas} %{!?_with_nas:--without-nas} \
+%if 0%{?final}
   --enable-final
 %endif
 
@@ -188,6 +207,13 @@
 
 
 %changelog
+* Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> 8:1.5.10-1
+- arts-1.5.10
+
+* Thu May 15 2008 Rex Dieter <rdieter at fedoraproject.org> 8:1.5.9-3
+- arts support for mixed multilib usage (#444484)
+- f10+: drop optional esd, jack, nas support
+
 * Wed Mar 12 2008 Rex Dieter <rdieter at fedoraproject.org> 8:1.5.9-2
 - s/qt-devel/qt3-devel/
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arts/F-9/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	14 Feb 2008 13:33:28 -0000	1.34
+++ sources	30 Aug 2008 14:27:08 -0000	1.35
@@ -1 +1 @@
-62a5e4d522314bab19288e4702480c93  arts-1.5.9.tar.bz2
+6da172aab2a4a44929b5fdfc30fa3efc  arts-1.5.10.tar.bz2