- adjusted kde-am patch to support also automake 1.12 through 1.14

[packages/arts.git] / arts.spec

diff --git a/arts.spec b/arts.spec
index 26d9462a2721b0d39cb6c38a39a392c8e44147df..cf46329915a6075cd94c5e7ab2ce2649f7601fd1 100644 (file)
--- a/arts.spec
+++ b/arts.spec
@@ -1,43 +1,49 @@
 #
 # Conditional build:
-%bcond_without alsa    # disable ALSA support
-%bcond_with    nas     # enable NAS support
-%bcond_without esd     # disable esound support
-%bcond_without hidden_visibility       # pass '--fvisibility=hidden' & '--fvisibility-inlines-hidden' to g++
-#
+%bcond_without alsa                    # ALSA support
+%bcond_with    nas                     # NAS support
+%bcond_with    arts                    # aRts support (i.e. actually build this package)
+%bcond_without esd                     # EsounD support
+%bcond_without hidden_visibility       # '--fvisibility=hidden' & '--fvisibility-inlines-hidden' g++ opts
+
 %define                _state          stable
-%define                _kdever         3.5.9
+%define                _kdever         3.5.10
 
 Summary:       aRts sound server
 Summary(pl.UTF-8):     Serwer dźwięku
 Summary(pt_BR.UTF-8):  Servidor de sons usado pelo KDE
 Name:          arts
-Version:       1.5.9
-Release:       4
+Version:       1.5.10
+Release:       15
 Epoch:         13
 License:       LGPL
 Group:         Libraries
 Source0:       ftp://ftp.kde.org/pub/kde/%{_state}/%{_kdever}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: 62a5e4d522314bab19288e4702480c93
+# Source0-md5: 6da172aab2a4a44929b5fdfc30fa3efc
 #Patch100:     %{name}-branch.diff
 Patch0:                %{name}-libs.patch
 Patch1:                kde-ac260-lt.patch
 Patch2:                %{name}-extension_loader.patch
 Patch3:                %{name}-gcc43.patch
+Patch4:                %{name}-fortify.patch
+Patch5:                kde-am.patch
+Patch6:                %{name}-ac.patch
 URL:           http://www.arts-project.org/
 %{?with_alsa:BuildRequires:    alsa-lib-devel}
 BuildRequires: audiofile-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: boost-devel >= 1.35.0
-BuildRequires: docbook-dtd41-sgml
-BuildRequires: docbook-utils >= 0.6.14
 %{?with_esd:BuildRequires:     esound-devel}
 %{?with_hidden_visibility:BuildRequires:       gcc-c++ >= 5:4.1.0-0.20051206r108118.1}
 BuildRequires: glib2-devel >= 2.0.0
 BuildRequires: jack-audio-connection-kit-devel
+%if "%{pld_release}" == "th"
+%{!?with_arts:BuildRequires:   die, not meant for th}
+%endif
 BuildRequires: libmad-devel
 BuildRequires: libtool >= 2:1.5-2
+BuildRequires: libuuid-devel
 BuildRequires: libvorbis-devel
 %{?with_nas:BuildRequires:     nas-devel}
 BuildRequires: pkgconfig
@@ -168,6 +174,9 @@ Pliki programistyczne dla biblioteki qtmcop.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 find . -type f -name '*.mcopclass' | xargs %{__sed} -i -e 's:\.la::'
 
@@ -199,7 +208,7 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 # it seems to be only (lt_)dlopened, nothing links with it - so not needed
-rm -f $RPM_BUILD_ROOT%{_libdir}/libx11globalcomm.{la,so}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libx11globalcomm.{la,so}
 
 # remove unwanted boost deps from .la
 sed -i 's:-lboost_filesystem -lboost_regex::' $RPM_BUILD_ROOT%{_libdir}/*.la