RPM Packaging: update dependencies

11 files changed, 93 insertions, 55 deletions

diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index 5c81da101..0ae8446d8 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -3,6 +3,8 @@
 %define _variant .opt
 %endif
 
+%define tde_version 14.0.0
+
 %define tde_bindir %{tde_prefix}/bin
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
@@ -13,7 +15,7 @@
 %define _docdir %{tde_datadir}/doc
 
 Name:		trinity-arts
-Version:	14.0.0
+Version:	%{tde_version}
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 License:	GPL
 Summary:	aRts (analog realtime synthesizer) - the TDE sound system
@@ -30,7 +32,7 @@ Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 Source1:	kcmartsrc-pulseaudio
 
 BuildRequires:	cmake >= 2.8
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	audiofile-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	glib2-devel
@@ -202,20 +204,26 @@ Requires:	%{name} = %{version}-%{release}
 cd build
 %endif
 
-%cmake \
+%cmake .. \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
   -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
   -DBIN_INSTALL_DIR="%{tde_bindir}" \
   -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}/arts" \
   -DLIB_INSTALL_DIR="%{tde_libdir}" \
-  -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
+  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+  \
   -DWITH_ALSA=ON \
   -DWITH_AUDIOFILE=ON \
   -DWITH_VORBIS=ON \
   %{?with_libmad:-DWITH_MAD=ON} %{!?with_libmad:-DWITH_MAD=OFF} \
   %{?with_esound:-DWITH_ESOUND=ON} \
-  %{?with_jack:-DWITH_JACK=ON} \
-  -DCMAKE_SKIP_RPATH=OFF \
-  ..
+  %{?with_jack:-DWITH_JACK=ON}
 
 %__make %{?_smp_mflags} || %__make
 
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
index 32a0f3102..44af00be7 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -3,7 +3,9 @@
 %define _variant .opt
 %endif
 
-# TDE 3.5.13 specific building variables
+%define tde_version 14.0.0
+
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_includedir %{tde_prefix}/include
 %define tde_datadir %{tde_prefix}/share
@@ -12,7 +14,7 @@
 
 
 Name:		trinity-avahi-tqt
-Version:	14.0.0
+Version:	%{tde_version}
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 License:	GPL
 Summary:	Avahi TQT Interface
@@ -30,33 +32,33 @@ Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires:	gcc-c++
 BuildRequires:	cmake >= 2.8
 BuildRequires:	trinity-tqt3-devel >= 3.5.0
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	gettext-devel
 BuildRequires:	libtool
 
 # DBUS support
 %if 0%{?suse_version}
 BuildRequires:	dbus-1-devel
-%else
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	dbus-devel
 %endif
 
+# AVAHI support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}avahi-client-devel
-%if 0%{?pclinuxos}
-BuildRequires:	libexpat-devel
-%else
-# On Mageia 2, package is 'lib64expat1-devel', but on Mandriva, 'lib64expat-devel'
-BuildRequires:	%{_lib}expat%{?mgaversion:1}-devel
-%endif
 Provides:		%{_lib}avahi-qt3
-%else
+%endif
+%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
 BuildRequires:	avahi-devel
-%if 0%{?suse_version}
-BuildRequires:	libexpat-devel
-%else
+%endif
+
+# EXPAT support
+%if 0%{?rhel} || 0%{?fedora}
 BuildRequires:	expat-devel
 %endif
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	libexpat-devel
 %endif
 
 Requires:		trinity-tqt3 >= 3.5.0
@@ -94,10 +96,12 @@ Development files for %{name}
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
+unset QTDIR QTINC QTLIB
+./autogen.sh
+
 
 %build
-unset QTDIR
-./autogen.sh
+unset QTDIR QTINC QTLIB
 
 %configure \
   --exec-prefix=%{tde_prefix} \
@@ -106,12 +110,16 @@ unset QTDIR
   --docdir=%{tde_docdir} \
   --includedir=%{tde_includedir} \
   --libdir=%{tde_libdir} \
+  \
+  --disable-static \
+  --disable-dependency-tracking \
+  \
   --enable-compat-libdns_sd \
-  --with-systemdsystemunitdir=/lib/systemd/system \
-  --disable-static
+  --with-systemdsystemunitdir=/lib/systemd/system
 
 %__make %{?_smp_mflags}
 
+
 %install
 %__rm -rf %{?buildroot}
 %__make install DESTDIR=%{?buildroot}
@@ -145,5 +153,5 @@ unset QTDIR
 %{tde_libdir}/pkgconfig/avahi-tqt.pc
 
 %changelog
-* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE R14, using 'tqt3' instead of 'qt3'
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+- Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
index 217e25493..38774d5aa 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
@@ -109,6 +109,13 @@ cd build
 %endif
 
 %cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
   -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   ..
@@ -126,5 +133,5 @@ cd build
 
 
 %changelog
-* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+- Initial release for TDE R14.0.0
diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
index a31156cc2..3cdb3cd82 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
@@ -156,11 +156,14 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
   --libdir=%{tde_libdir} \
   --datadir=%{tde_datadir} \
   --includedir=%{tde_tdeincludedir} \
-  --disable-rpath \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
   --enable-new-ldflags \
+  --enable-final \
   --enable-closure \
-  --disable-debug --disable-warnings \
-  --enable-final
+  --disable-rpath \
+  --enable-gcc-hidden-visibility
   
 %__make %{?_smp_mflags}
 
diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
index fbe3bf8d2..839955a60 100644
--- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
+++ b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
@@ -78,7 +78,7 @@ Provides:	libcaldav-devel = %{version}-%{release}
 
 %build
 # CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
-export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${CFLAGS}"
+export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
 if [ -d /usr/evolution28 ]; then
@@ -89,7 +89,9 @@ fi
   --docdir=%{tde_docdir}/libcaldav \
   --includedir=%{tde_includedir} \
   --libdir=%{tde_libdir} \
-  
+  \
+  --disable-dependency-tracking
+
 %__make %{?_smp_mflags}
 
 %install
@@ -98,6 +100,7 @@ fi
 
 %__rm -f %{buildroot}%{tde_libdir}/*.a
 
+
 %clean
 %__rm -rf %{buildroot}
 
diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
index 42ba6579e..6e4c9e329 100644
--- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
@@ -25,7 +25,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-
+# CURL support
 %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
 BuildRequires:	libcurl-devel
 %else
@@ -76,20 +76,22 @@ Provides:	libcarddav-devel = %{version}-%{release}
 
 %build
 # CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
-export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${CFLAGS}"
+export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
+# RHEL4 stuff
 if [ -d /usr/evolution28 ]; then
   export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
 fi
 
-#autoreconf --force --install --symlink
-
 %configure \
   --includedir=%{tde_includedir} \
   --libdir=%{tde_libdir} \
-  
-%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
+  \
+  --disable-dependency-tracking
+
+%__make %{?_smp_mflags}
+
 
 %install
 %__rm -rf %{buildroot}
@@ -97,6 +99,7 @@ fi
 
 %__rm -f %{buildroot}%{tde_libdir}/libcarddav.a
 
+
 %clean
 %__rm -rf %{buildroot}
 
@@ -126,9 +129,12 @@ fi
 
 
 %Changelog
-* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3
-- Renames to 'trinity-libcaldav'
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.3-4
+- Initial release for TDE R14.0.0
+
+* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.2-3
+- Renames to 'trinity-libcarddav'
 - Build on MGA2
 
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2 .1
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.2-2
 - Initial release for RHEL 6, RHEL 5, and Fedora 15
diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
index 46fac8e28..825acf76f 100644
--- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
+++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
@@ -154,7 +154,7 @@ cp -rf ../pyuic3 ../pylupdate3 .
 
 echo yes | python ../configure.py \
 	-c -n %{_includedir}/tqscintilla \
-	-q /usr/share/tqt3 \
+	-q %{_datadir}/tqt3 \
 	-y tqt-mt \
 	-o %{_libdir} -u -j 10 \
 	-d %{python_sitearch} \
@@ -178,5 +178,5 @@ echo yes | python ../configure.py \
 
 
 %changelog
-* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE R14, using 'tqt3' instead of 'qt3'
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.18.1-1
+- Initial release for TDE R14.0.0
diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec
index 1a0686928..71dc7e348 100644
--- a/redhat/dependencies/tqca/tqca-14.0.0.spec
+++ b/redhat/dependencies/tqca/tqca-14.0.0.spec
@@ -95,7 +95,7 @@ perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra
 
 
 %build
-unset QTDIR
+unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
index 021d612f3..227759bc6 100644
--- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
+++ b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
@@ -174,5 +174,5 @@ done
 %{tde_docdir}/HTML/en/%{name}
 
 %changelog
-* Tue Jul 02 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.1-1
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.1-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index dcabb903f..eb277a818 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -534,7 +534,8 @@ echo yes | ./configure \
 						\
 		-lfontconfig			\
 		-inputmethod			\
-		-glibmainloop
+		-glibmainloop \
+		-debug
 
 
 # Fix bad headers
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index 6c99e6b7b..bc87f7180 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -2,6 +2,8 @@
 %define tde_prefix /usr
 %define cmake_modules_dir %{_datadir}/cmake/Modules
 
+%define tde_version 14.0.0
+
 # TQT include files may conflict with QT4 includes, so we move them to a subdirectory.
 # Later compiled Trinity products should be aware of that !
 %define tde_bindir %{tde_prefix}/bin
@@ -9,7 +11,7 @@
 %define tde_libdir %{tde_prefix}/%{_lib}
 
 Name:		trinity-tqtinterface
-Version:	14.0.0
+Version:	%{tde_version}
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 License:	GPL
 Summary:	Trinity QT Interface
@@ -23,7 +25,6 @@ Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
-# TDE 3.5.13 specific building variables
 BuildRequires:	cmake >= 2.8
 BuildRequires:	trinity-tqt3-devel >= 3.5.0
 Requires:		trinity-tqt3 >= 3.5.0
@@ -122,7 +123,7 @@ Development files for %{name}
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
 %build
-unset QTDIR
+unset QTDIR QTINC QTLIB
 
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 %__mkdir_p build
@@ -130,12 +131,13 @@ cd build
 %endif
 
 %cmake \
-  -DCMAKE_BUILD_TYPE="" \
-  -DCMAKE_C_FLAGS="-DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="-DNDEBUG" \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=ON \
+  \
   -DQTDIR="%{tde_datadir}/tqt3" \
   -DQT_INCLUDE_DIRS="%{tde_includedir}/tqt3" \
   -DQT_LIBRARY_DIRS="%{tde_libdir}" \