RPM Packaging: update packages for 3.5.13.2 under Fedora 19

1 files changed, 18 insertions, 15 deletions

diff --git a/redhat/dependencies/arts/arts-3.5.13.2.spec b/redhat/dependencies/arts/arts-3.5.13.2.spec
index 37db1d0b6..d955876cc 100644
--- a/redhat/dependencies/arts/arts-3.5.13.2.spec
+++ b/redhat/dependencies/arts/arts-3.5.13.2.spec
@@ -15,8 +15,9 @@
 %define _docdir %{tde_datadir}/doc
 
 Name:		trinity-arts
-Version:	%{tde_version}
-Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Epoch:		1
+Version:	1.5.10
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 License:	GPL
 Summary:	aRts (analog realtime synthesizer) - the TDE sound system
 Group:		System Environment/Daemons 
@@ -28,7 +29,7 @@ Packager:	Francois Andriot <francois.andriot@free.fr>
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source1:	kcmartsrc-pulseaudio
 
 BuildRequires:	cmake >= 2.8
@@ -89,10 +90,7 @@ BuildRequires:		libmad-devel
 %define with_pulseaudio 1
 %endif
 
-# TDE 3.5.13 specific building variables
-BuildRequires: cmake >= 2.8
-
-Requires:		trinity-tqtinterface >= %{version}
+Requires:		trinity-tqtinterface >= %{tde_version}
 Requires:		audiofile
 
 %if "%{?tde_prefix}" == "/usr"
@@ -141,7 +139,7 @@ playing a wave file with some effects.
 %package devel
 Group:		Development/Libraries
 Summary:	%{name} - Development files
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{?tde_prefix}" == "/usr"
 Obsoletes:	arts-devel
 %endif
@@ -174,7 +172,7 @@ Development files for %{name}
 %package config-pulseaudio
 Group:		System Environment/Daemons
 Summary:	%{name} - Default configuration file for Pulseaudio
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description config-pulseaudio
 %{summary}
@@ -195,7 +193,7 @@ Requires:	%{name} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 
 %build
@@ -208,11 +206,12 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 cd build
 %endif
 
-%cmake .. \
-  -DCMAKE_BUILD_TYPE="" \
-  -DCMAKE_C_FLAGS="-DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="-DNDEBUG" \
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   \
   -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
@@ -226,7 +225,8 @@ cd build
   -DWITH_VORBIS=ON \
   %{?with_libmad:-DWITH_MAD=ON} %{!?with_libmad:-DWITH_MAD=OFF} \
   %{?with_esound:-DWITH_ESOUND=ON} \
-  %{?with_jack:-DWITH_JACK=ON}
+  %{?with_jack:-DWITH_JACK=ON} \
+  ..
 
 %__make %{?_smp_mflags} || %__make
 
@@ -246,6 +246,9 @@ cd build
 
 
 %changelog
+* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:1.5.10-1
+- Build for Fedora 19
+
 * Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
 - Rebuild with NDEBUG option