RPM Packaging: update packages for 3.5.13.2 under Fedora 19

9 files changed, 416 insertions, 213 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
 
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec
index 0cf7032cc..cd59347e4 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec
@@ -1,18 +1,13 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
+# TDE specific building variables
+%define tde_version 3.5.13.2
+%define tde_prefix /usr
 %define tde_includedir %{tde_prefix}/include
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
 %define tde_libdir %{tde_prefix}/%{_lib}
 
 
 Name:		trinity-avahi-tqt
-Version:	3.5.13.2
+Epoch:		1
+Version:	0.6.30
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 License:	GPL
 Summary:	Avahi TQT Interface
@@ -25,43 +20,42 @@ URL:		http://www.trinitydesktop.org/
 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
 
 BuildRequires:	gcc-c++
-BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel
-BuildRequires:	tqtinterface-devel >= 3.5.13.1
+BuildRequires:	qt3-devel >= 3.3.8d
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	gettext-devel
 BuildRequires:	libtool
 %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:		qt3
-Requires:		trinity-tqtinterface >= 3.5.13
+Requires:		qt3 >= 3.3.8d
+Requires:		trinity-tqtinterface >= %{tde_version}
 
-Obsoletes:		avahi-tqt < %{version}-%{release}
-Provides:		avahi-tqt = %{version}-%{release}
+Obsoletes:		avahi-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		avahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -69,16 +63,16 @@ Avahi TQT Interface
 
 
 %package devel
-Requires:	%{name}
 Summary:	%{name} - Development files
 Group:		Development/Libraries
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %if 0%{?mgaversion} || 0%{?mdkversion}
 Provides:		%{_lib}avahi-qt3-devel
 %endif
 
-Obsoletes:		avahi-tqt-devel < %{version}-%{release}
-Provides:		avahi-tqt-devel = %{version}-%{release}
+Obsoletes:		avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 Development files for %{name}
@@ -90,45 +84,32 @@ Development files for %{name}
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "acinclude.m4" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "./ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "./ltmain.sh"
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+./autogen.sh
 
-# Removes stale libtool stuff
-%__rm -f common/libtool.m4 common/ltoptions.m4 common/lt~obsolete.m4 common/ltsugar.m4 common/ltversion.m4
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir} -I%{tde_includedir}/tqt"
-export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
-
-./autogen.sh
 
 %configure \
   --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_docdir} \
   --includedir=%{tde_includedir} \
   --libdir=%{tde_libdir} \
+  \
+  --disable-static \
+  --disable-dependency-tracking \
+  \
   --enable-compat-libdns_sd \
-  --with-systemdsystemunitdir=/lib/systemd/system  \
-  MOC_QT3=%{tde_bindir}/moc-tqt
+  --with-systemdsystemunitdir=/lib/systemd/system
 
 %__make %{?_smp_mflags}
 
+
 %install
 %__rm -rf %{?buildroot}
 %__make install DESTDIR=%{?buildroot}
 
-# Removes '.a' file
-%__rm -f %{?buildroot}%{tde_libdir}/libavahi-tqt.a
 
 %clean
 %__rm -rf %{?buildroot}
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec
index 36f1e0a58..58f738326 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec
@@ -1,21 +1,20 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
+# TDE specific building variables
+%define tde_version 3.5.13.2
+%define tde_prefix /usr
 %define tde_bindir %{tde_prefix}/bin
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 
 Name:		trinity-dbus-1-tqt
-Version:	3.5.13.2
+Epoch:		1
+Version:	0.9
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 License:	GPL
 Summary:	Dbus TQT Interface
 Group:		System Environment/Libraries
 
-Obsoletes:		dbus-1-tqt < %{version}-%{release}
-Provides:		dbus-1-tqt = %{version}-%{release}
+Obsoletes:		dbus-1-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		dbus-1-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
@@ -23,7 +22,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
 
 BuildRequires:	gcc-c++
 %if 0%{?suse_version}
@@ -31,36 +30,63 @@ BuildRequires:	dbus-1-devel
 %else
 BuildRequires:	dbus-devel
 %endif
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
 
-# TDE 3.5.13 specific building variables
 BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel
-Requires:		qt3
+BuildRequires:	qt3-devel >= 3.3.8d
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+Requires:		qt3 >= 3.3.8d
 
 
 %description
 Dbus TQT Interface
 
+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/dbusxml2qt3
+%{tde_libdir}/libdbus-1-tqt.so.0
+%{tde_libdir}/libdbus-1-tqt.so.0.0.0
+
+##########
 
 %package devel
 Requires:	%{name}
 Summary:	%{name} - Development files
 Group:		Development/Libraries
 
-Obsoletes:		dbus-1-tqt-devel < %{version}-%{release}
-Provides:		dbus-1-tqt-devel = %{version}-%{release}
+Obsoletes:		dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 Development files for %{name}
 
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_includedir}/*.h
+%{tde_libdir}/libdbus-1-tqt.so
+%{tde_libdir}/libdbus-1-tqt.la
+%{tde_libdir}/pkgconfig/*.pc
+
+##########
+
 %if 0%{?suse_version} || 0%{?pclinuxos}
 %debug_package
 %endif
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 
 %build
@@ -73,6 +99,12 @@ 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=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  \
   -DBIN_INSTALL_DIR=%{tde_bindir} \
   -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
@@ -85,34 +117,14 @@ cd build
 %__rm -rf %{?buildroot}
 %__make install DESTDIR=%{?buildroot} -C build
 
+
 %clean
 %__rm -rf %{?buildroot}
 
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/dbusxml2qt3
-%{tde_libdir}/libdbus-1-tqt.so.0
-%{tde_libdir}/libdbus-1-tqt.so.0.0.0
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/*.h
-%{tde_libdir}/libdbus-1-tqt.so
-%{tde_libdir}/libdbus-1-tqt.la
-%{tde_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:0.9-1
+- Build for Fedora 19
+
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
 - Initial release for TDE 3.5.13.2
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec
index a4a4488a9..68dac0e31 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec
@@ -1,13 +1,12 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
+# TDE specific building variables
+%define tde_version 3.5.13.2
+%define tde_prefix /usr
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 
 Name:		trinity-dbus-tqt
-Version:	3.5.13.2
+Epoch:		1
+Version:	0.63
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 License:	GPL
 Summary:	Dbus TQT Interface
@@ -19,7 +18,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
 
 # [dbus-tqt] Fix build on RHEL 4
 Patch1:		dbus-tqt-3.5.13-fix_old_dbus_types.patch
@@ -32,31 +31,55 @@ BuildRequires:	dbus-devel
 %endif
 BuildRequires:	trinity-tqtinterface-devel >= %{version}
 
-# TDE 3.5.13 specific building variables
 BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel
+BuildRequires:	qt3-devel >= 3.3.8d
+Requires:		qt3 >= 3.3.8d
 
-Requires:		qt3
-
-Obsoletes:		dbus-tqt < %{version}-%{release}
-Provides:		dbus-tqt = %{version}-%{release}
+Obsoletes:		dbus-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		dbus-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
 Dbus TQT Interface
 
+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+%files
+%defattr(-,root,root,-)
+%{tde_libdir}/libdbus-tqt-1.so.0
+%{tde_libdir}/libdbus-tqt-1.so.0.0.0
+
+##########
 
 %package devel
 Requires:		%{name}
 Summary:		%{name} - Development files
 Group:			Development/Libraries
 
-Obsoletes:		dbus-tqt-devel < %{version}-%{release}
-Provides:		dbus-tqt-devel = %{version}-%{release}
+Obsoletes:		dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 Development files for %{name}
 
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_includedir}/dbus-1.0/*
+%{tde_libdir}/libdbus-tqt-1.so
+%{tde_libdir}/libdbus-tqt-1.la
+%{tde_libdir}/pkgconfig/dbus-tqt.pc
+
+##########
 
 %if 0%{?suse_version} || 0%{?pclinuxos}
 %debug_package
@@ -64,7 +87,7 @@ Development files for %{name}
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %if 0%{?rhel} == 4
 %patch1 -p1 -b .dbustypes
@@ -85,6 +108,12 @@ 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=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  \
   -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   ..
@@ -96,33 +125,14 @@ cd build
 %__rm -rf %{?buildroot}
 %__make install DESTDIR=%{?buildroot} -C build
 
+
 %clean
 %__rm -rf %{?buildroot}
 
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%defattr(-,root,root,-)
-%{tde_libdir}/libdbus-tqt-1.so.0
-%{tde_libdir}/libdbus-tqt-1.so.0.0.0
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/dbus-1.0/*
-%{tde_libdir}/libdbus-tqt-1.so
-%{tde_libdir}/libdbus-tqt-1.la
-%{tde_libdir}/pkgconfig/dbus-tqt.pc
 
 %changelog
+* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:0.63-1
+- Build for Fedora 19
+
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
 - Initial release for TDE 3.5.13.2
diff --git a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec
index f792bb98d..9bd814c2a 100644
--- a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec
+++ b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec
@@ -3,6 +3,8 @@
 %define _variant .opt
 %endif
 
+%define tde_version 3.5.13.2
+
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
@@ -10,7 +12,7 @@
 
 Name:		trinity-libcaldav
 Version:	0.6.5
-Release:	3%{?dist}%{?_variant}
+Release:	%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
 
 Vendor:		Trinity Project
 URL:		http://www.trinitydesktop.org/
@@ -60,6 +62,7 @@ easy to integrate CalDAV support into any PIM application.
 Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+
 Obsoletes:	libcaldav-devel < %{version}-%{release}
 Provides:	libcaldav-devel = %{version}-%{release}
 
@@ -74,44 +77,50 @@ Provides:	libcaldav-devel = %{version}-%{release}
 %prep
 %setup -q -n libcaldav-%{version}
 %patch1 -p1 -b .dir
+autoreconf --force --install --symlink
+
 
 %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
   export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
 fi
 
-autoreconf --force --install --symlink
 %configure \
   --docdir=%{tde_docdir}/libcaldav \
   --includedir=%{tde_includedir} \
   --libdir=%{tde_libdir} \
-  
+  \
+  --disable-dependency-tracking
+
 %__make %{?_smp_mflags}
 
+
 %install
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
+# Unwanted files
 %__rm -f %{buildroot}%{tde_libdir}/*.a
 
+
 %clean
 %__rm -rf %{buildroot}
 
 
 %files
 %defattr(-,root,root,-)
-%{tde_libdir}/*.so.*
+%{tde_libdir}/libcaldav.so.*
 %{tde_docdir}/libcaldav/
 
 %files devel
 %defattr(-,root,root,-)
 %{tde_includedir}/caldav.h
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
+%{tde_libdir}/libcaldav.la
+%{tde_libdir}/libcaldav.so
 %{tde_libdir}/pkgconfig/libcaldav.pc
 
 %post
@@ -128,7 +137,10 @@ autoreconf --force --install --symlink
 
 
 %Changelog
-* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3
+* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.5-4
+- Build for Fedora 19
+
+* Sat Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3
 - Renames to 'trinity-libcaldav'
 - Build on MGA2
 
diff --git a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
new file mode 100644
index 000000000..532354e33
--- /dev/null
+++ b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
@@ -0,0 +1,146 @@
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+%define tde_version 3.5.13.2
+
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+
+Name:		trinity-libcarddav
+Version:	0.6.2
+Release:	%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+
+Vendor:		Trinity Project
+URL:		http://www.trinitydesktop.org/
+Packager:	Francois Andriot <francois.andriot@free.fr>
+
+License:	GPL
+Group:		System Environment/Libraries
+Summary:	A portable CardDAV client implementation originally developed for the Trinity PIM suite.
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	libcarddav_0.6.2-2debian2.tar.gz
+
+# [libcarddav] Fix messy installation directories
+Patch1:		libcarddav-0.6.5-fix_installation.patch
+
+# CURL support
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
+BuildRequires:	libcurl-devel
+%else
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}curl-devel
+%else
+# Specific CURL version for TDE on RHEL 5 (and older)
+BuildRequires:	trinity-libcurl-devel
+%endif
+%endif
+
+%if 0%{?rhel} == 4
+BuildRequires:	evolution28-gtk2-devel
+%else
+BuildRequires:	glib2-devel
+BuildRequires:	gtk2-devel
+%endif
+BuildRequires:	make
+
+Obsoletes:	libcarddav < %{version}-%{release}
+Provides:	libcarddav = %{version}-%{release}
+
+%description
+Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. 
+It incorporates full list, get, add, modify, and delete functionality per the latest CardDAV standards. 
+Build dependencies are minimal, requiring only libcurl.
+
+%package devel
+Summary:	Development files for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+Obsoletes:	libcarddav-devel < %{version}-%{release}
+Provides:	libcarddav-devel = %{version}-%{release}
+
+%description devel
+%{summary}
+
+%if 0%{?suse_version} || 0%{?pclinuxos}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n libcarddav-%{version}
+%patch1 -p1 -b .dir
+autoreconf --force --install --symlink
+
+
+%build
+unset QTDIR; . /etc/profile.d/qt3.sh
+
+# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
+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
+
+%configure \
+  --includedir=%{tde_includedir} \
+  --libdir=%{tde_libdir} \
+  \
+  --disable-dependency-tracking
+
+%__make %{?_smp_mflags}
+
+
+%install
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} LIBTOOL=$(which libtool)
+
+%__rm -f %{buildroot}%{tde_libdir}/libcarddav.a
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{tde_libdir}/libcarddav.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_includedir}/carddav.h
+%{tde_libdir}/libcarddav.la
+%{tde_libdir}/libcarddav.so
+%{tde_libdir}/pkgconfig/libcarddav.pc
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+%post devel
+/sbin/ldconfig
+
+%postun devel
+/sbin/ldconfig
+
+
+%Changelog
+* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.2-4
+- Build for Fedora 19
+
+* Sat Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.2-3
+- Renames to 'trinity-libcaldav'
+- Build on MGA2
+
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.2-2debian2 .1
+- Initial release for RHEL 6, RHEL 5, and Fedora 15
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec
index 9b07e7087..c186c9c70 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec
@@ -3,6 +3,8 @@
 %define _variant .opt
 %endif
 
+%define tde_version 3.5.13.2
+
 %define tde_bindir %{tde_prefix}/bin
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
@@ -12,21 +14,21 @@
 
 %define _docdir %{tde_datadir}/doc
 
-Name:		trinity-tqca-tls
-Version:	1.0
-Release:	2%{?dist}%{?_variant}
+Name:			trinity-tqca-tls
+Version:		1.0
+Release:		%{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
 
-Summary:	TLS plugin for the TQt Cryptographic Architecture
-License:	LGPLv2+
-Group:		Applications/Internet
+Summary:		TLS plugin for the TQt Cryptographic Architecture
+License:		LGPLv2+
+Group:			Applications/Internet
 
-URL:		http://delta.affinix.com/qca/
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:			http://delta.affinix.com/qca/
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	tqca-tls-master.tar.gz
+Source0:		tqca-tls-master.tar.gz
 
 # Fix build in mach for QT apps
 Patch0:		qca-tls-1.0-mach.patch
@@ -35,8 +37,8 @@ Patch2:     qca-tls-1.0-ossl10.patch
 # Allows building with TQT3 from TDE
 Patch10:	tqca-tls-qt3.patch
 
-BuildRequires:  qt3-devel >= 3.3.8.d
-BuildRequires:  trinity-tqtinterface-devel >= 3.5.13.2
+BuildRequires:	qt3-devel >= 3.3.8.d
+BuildRequires:  trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-tqca-devel >= 1.0
 BuildRequires:	openssl-devel >= 0.9.8
 
@@ -99,6 +101,9 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
 
 %changelog
+* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3
+- Build for Fedora 19
+
 * Thu Jun 27 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-2
 - Renames TQCA to QCA in source code
 
diff --git a/redhat/dependencies/tqca/tqca-3.5.13.2.spec b/redhat/dependencies/tqca/tqca-3.5.13.2.spec
index 423c9104d..ac4b88cca 100644
--- a/redhat/dependencies/tqca/tqca-3.5.13.2.spec
+++ b/redhat/dependencies/tqca/tqca-3.5.13.2.spec
@@ -3,6 +3,8 @@
 %define _variant .opt
 %endif
 
+%define tde_version 3.5.13.2
+
 %define tde_bindir %{tde_prefix}/bin
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
@@ -15,7 +17,7 @@
 
 Name:           trinity-tqca
 Version:        1.0
-Release:        2%{?dist}%{?_variant}
+Release:		%{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
 
 Summary:        TQt Cryptographic Architecture
 
@@ -31,11 +33,12 @@ Prefix:			%{tde_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:        tqca-master.tar.gz
+
 Patch0:         qca-1.0-mach.patch
 Patch1:			tqca-1.0-fix_qt3_detection.patch
 
 BuildRequires:  qt3-devel >= 3.3.8.d
-BuildRequires:  trinity-tqtinterface-devel >= 3.5.13.2
+BuildRequires:  trinity-tqtinterface-devel >= %{tde_version}
 
 %description
 Taking a hint from the similarly-named Java Cryptography Architecture,
@@ -124,6 +127,9 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
 
 %changelog
+* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3
+- Build for Fedora 19
+
 * Thu Jun 27 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-2
 - Renames TQCA to QCA in source code
 
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
index 8ace60ef9..a153b133b 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
@@ -1,20 +1,14 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%define cmake_modules_dir %{tde_prefix}/share/cmake
-%else
-%define cmake_modules_dir %{_datadir}/cmake/Modules
-%endif
-
-# TQT include files may conflict with QT4 includes, so we move them to a subdirectory.
-# Later compiled Trinity products should be aware of that !
+# TDE specific building variables
+%define tde_version 3.5.13.2
+%define tde_prefix /usr
 %define tde_bindir %{tde_prefix}/bin
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
+%define cmake_modules_dir %{_datadir}/cmake/Modules
 
 Name:		trinity-tqtinterface
-Version:	3.5.13.2
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Version:	%{tde_version}
+Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
 License:	GPL
 Summary:	Trinity QT Interface
 Group:		System Environment/Libraries
@@ -27,7 +21,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:	qt3-devel >= 3.3.8d
 Requires:		qt3 >= 3.3.8d
@@ -60,11 +53,39 @@ Provides:	tqtinterface = %{version}-%{release}
 %description
 Trinity QT Interface
 
+
+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/convert_qt_tqt1
+%{tde_bindir}/convert_qt_tqt2
+%{tde_bindir}/convert_qt_tqt3
+%{tde_bindir}/dcopidl-tqt
+%{tde_bindir}/dcopidl2cpp-tqt
+%{tde_bindir}/dcopidlng-tqt
+%{tde_bindir}/mcopidl-tqt
+%{tde_bindir}/moc-tqt
+%{tde_bindir}/tmoc
+%{tde_bindir}/tqt-replace
+%{tde_bindir}/tqt-replace-stream
+%{tde_bindir}/uic-tqt
+%{tde_libdir}/libtqassistantclient.so.4
+%{tde_libdir}/libtqassistantclient.so.4.2.0
+%{tde_libdir}/libtqt.so.4
+%{tde_libdir}/libtqt.so.4.2.0
+
+##########
+
 %package devel
 Group:		Development/Libraries
 Summary:	%{name} - Development files
 Requires:	%{name} = %{version}-%{release}
-Requires:	qt3-devel
+Requires:	qt3-devel >= 3.3.8d
 
 Obsoletes:	tqtinterface-devel < %{version}-%{release}
 Provides:	tqtinterface-devel = %{version}-%{release}
@@ -72,6 +93,24 @@ Provides:	tqtinterface-devel = %{version}-%{release}
 %description devel
 Development files for %{name}
 
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_includedir}/tqt/
+%{tde_libdir}/libtqassistantclient.la
+%{tde_libdir}/libtqassistantclient.so
+%{tde_libdir}/libtqt.la
+%{tde_libdir}/libtqt.so
+%{tde_libdir}/pkgconfig/tqt.pc
+%{cmake_modules_dir}/*.cmake
+
+##########
+
 %if 0%{?suse_version} || 0%{?pclinuxos}
 %debug_package
 %endif
@@ -92,14 +131,25 @@ cd build
 #  another directory than QT3_PREFIX. (E.g. Mageia 2, Mandriva ...)
 #  Otherwise, it defaults to ${QTDIR}/lib !
 %cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  \
   -DQT_PREFIX_DIR=${QTDIR} \
   -DQT_VERSION=3 \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DQT_LIBRARY_DIR="${QTLIB:-${QTDIR}/%{_lib}}" \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
   -DINCLUDE_INSTALL_DIR=%{tde_includedir}/tqt \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
   -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DQT_LIBRARY_DIR=${QTLIB:-${QTDIR}/%{_lib}} \
+  \
+  -DWITH_QT3="ON" \
+  -DBUILD_ALL="ON" \
+  -DUSE_QT3="ON" \
   ..
 
 %__make %{?_smp_mflags}
@@ -107,7 +157,6 @@ cd build
 
 %install
 %__rm -rf %{?buildroot}
-%__mkdir_p %{?buildroot}%{_includedir}
 %__make install DESTDIR=%{?buildroot} -C build
 
 # RHEL 5: add newline at end of include files to avoid warnings
@@ -123,35 +172,14 @@ for i in cmake/modules/*.cmake; do
   %__install -m 644 $i %{?buildroot}%{cmake_modules_dir}
 done
 
+
 %clean
 %__rm -rf %{?buildroot}
 
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/*
-%{tde_libdir}/*.so.*
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/tqt
-%{tde_libdir}/*.so
-%{tde_libdir}/*.la
-%{tde_libdir}/pkgconfig/*.pc
-%{cmake_modules_dir}/*.cmake
-
 
 %changelog
+* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
+- Build for Fedora 19
+
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
 - Initial release for TDE 3.5.13.2