jreznik pushed to arts (epel7). "- arts-1.5.10"

[notifications at fedoraproject.org]

>From 9e886ee92f0cdf7758faf8cb87883bd8ebce72e8 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Tue, 26 Aug 2008 18:45:34 +0000
Subject: - arts-1.5.10


diff --git a/.cvsignore b/.cvsignore
index 7098e83..1df9620 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-arts-1.5.9.tar.bz2
+arts-1.5.10.tar.bz2
diff --git a/arts-1.5.9-rh#444484.patch b/arts-1.5.9-rh#444484.patch
deleted file mode 100644
index cfa6ce0..0000000
--- a/arts-1.5.9-rh#444484.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- branches/arts/1.5/arts/artsc/artsdsp.in	2005/07/26 18:54:59	438982
-+++ branches/arts/1.5/arts/artsc/artsdsp.in	2008/04/03 16:18:49	793315
-@@ -89,45 +89,16 @@
-     fi
- fi
- 
--# setup artsdsp preload to hijack calls made to /dev/dsp
--origargs="$@"
--binary=`which $1`
--machine=`uname -m`
--
--set `file -L $binary`
--
--case $2 in
--    ELF)
--       ;;
--    *)
--       echo "artsdsp works only for binaries"
--       exit 1
--    esac
--
--case $3 in
--    32-bit)
--       arch_libdir=lib
--       ;;
--    64-bit)
--       arch_libdir=lib64
--       ;;
--    *)
--       exit 1
--esac
--
--set $origargs
--
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=${prefix}/${arch_libdir}
- 
- if test "$single_thread" = 1; then
--  LD_PRELOAD=${libdir}/libartsdsp_st.so.0
-+  LD_PRELOAD=${exec_prefix}/\\$LIB/libartsdsp_st.so.0
- else
--  LD_PRELOAD=${libdir}/libartsdsp.so.0:${libdir}/libartsc.so.0
-+  LD_PRELOAD=${exec_prefix}/\\$LIB/libartsdsp.so.0:${exec_prefix}/\\$LIB/libartsc.so.0
- fi
--if test -f ${libdir}/libdl.so.2; then
--  LD_PRELOAD=$LD_PRELOAD:${libdir}/libdl.so.2
-+if test -f ${exec_prefix}/\\$LIB/libdl.so.2; then
-+  LD_PRELOAD=$LD_PRELOAD:${exec_prefix}/\\$LIB/libdl.so.2
- fi
- export LD_PRELOAD
- 
diff --git a/arts.spec b/arts.spec
index 3f98187..281b747 100644
--- a/arts.spec
+++ b/arts.spec
@@ -1,8 +1,9 @@
 
+%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
@@ -13,12 +14,20 @@
 %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: 3%{?dist}
+Version: 1.5.10
+Release: 1%{?dist}
 
 License: LGPLv2+
 Url: http://www.kde.org
@@ -36,16 +45,15 @@ Patch8: arts-1.5.2-multilib.patch
 Patch50: arts-1.5.4-dlopenext.patch
 Patch51: kde-3.5-libtool-shlibext.patch
 # upstream patches
-# http://websvn.kde.org/branches/arts/1.5/arts/artsc/artsdsp.in?r1=438982&r2=793315&pathrev=793315
-Patch100: arts-1.5.9-rh#444484.patch
+
 
 # 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
@@ -93,7 +101,6 @@ Install %{name}-devel if you intend to write applications using aRts.
 
 %patch50 -p1 -b .dlopenext
 %patch51 -p1 -b .libtool-shlibext
-%patch100 -p4 -b .rh#444484
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
@@ -200,6 +207,9 @@ rm -rf  %{buildroot}
 
 
 %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
diff --git a/sources b/sources
index 7a03f66..b65159f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-62a5e4d522314bab19288e4702480c93  arts-1.5.9.tar.bz2
+6da172aab2a4a44929b5fdfc30fa3efc  arts-1.5.10.tar.bz2
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/arts.git/commit/?h=epel7&id=9e886ee92f0cdf7758faf8cb87883bd8ebce72e8