Mageia 2: add support for MGA2 build in redhat packages

7 files changed, 285 insertions, 86 deletions

diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
index 29f683e77..12b0b19e6 100755
--- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
@@ -3,6 +3,12 @@
 %define _variant .opt
 %endif
 
+%define tde_bindir %{_prefix}/bin
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+
+%define _docdir %{_prefix}/share/doc
+
 Name:		trinity-arts
 Version:	3.5.13
 Release:	4%{?dist}%{?_variant}
@@ -29,11 +35,17 @@ BuildRequires:	tqtinterface-devel
 BuildRequires:	audiofile-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	glib2-devel
-BuildRequires:	libtool-ltdl-devel
 BuildRequires:	gsl-devel
 BuildRequires:	libvorbis-devel
 BuildRequires:	esound-devel
+
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}jack-devel
+BuildRequires:	%{_lib}ltdl-devel
+%else
 BuildRequires:	jack-audio-connection-kit-devel
+BuildRequires:	libtool-ltdl-devel
+%endif
 
 # TDE 3.5.13 specific building variables
 BuildRequires: cmake >= 2.8
@@ -76,18 +88,20 @@ Development files for %{name}
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-%__mkdir build
-cd build
+%{?!mgaversion:%__mkdir build; cd build}
 %cmake \
-  -DINCLUDE_INSTALL_DIR=%{_includedir}/arts \
-  -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \
+  -DINCLUDE_INSTALL_DIR=%{tde_includedir}/arts \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
   -DWITH_ALSA=ON \
   -DWITH_AUDIOFILE=ON \
   -DWITH_VORBIS=ON \
   -DWITH_MAD=OFF \
   -DWITH_ESOUND=ON \
   -DWITH_JACK=ON \
+  -DCMAKE_SKIP_RPATH="OFF" \
   ..
 
 
@@ -103,30 +117,30 @@ cd build
 %files
 %defattr(-,root,root,-)
 %doc COPYING.LIB
-%dir %{_libdir}/mcop
-%dir %{_libdir}/mcop/Arts
-%{_libdir}/mcop/Arts/*
-%{_libdir}/mcop/*.mcopclass
-%{_libdir}/mcop/*.mcoptype
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
-%{_bindir}/artscat
-%{_bindir}/artsd
-%{_bindir}/artsdsp
-%{_bindir}/artsplay
-%{_bindir}/artsrec
-%{_bindir}/artsshell
-%{_bindir}/artswrapper
+%dir %{tde_libdir}/mcop
+%dir %{tde_libdir}/mcop/Arts
+%{tde_libdir}/mcop/Arts/*
+%{tde_libdir}/mcop/*.mcopclass
+%{tde_libdir}/mcop/*.mcoptype
+%{tde_libdir}/lib*.so.*
+%{tde_libdir}/lib*.la
+%{tde_bindir}/artscat
+%{tde_bindir}/artsd
+%{tde_bindir}/artsdsp
+%{tde_bindir}/artsplay
+%{tde_bindir}/artsrec
+%{tde_bindir}/artsshell
+%{tde_bindir}/artswrapper
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/mcopidl
-%dir %{_includedir}
-%{_includedir}/*/
-%{_bindir}/artsc-config
-%{_libdir}/lib*.so
-%{_libdir}/pkgconfig/*.pc
-%{_libdir}/*.a
+%{tde_bindir}/mcopidl
+%dir %{tde_includedir}
+%{tde_includedir}/*/
+%{tde_bindir}/artsc-config
+%{tde_libdir}/lib*.so
+%{tde_libdir}/pkgconfig/*.pc
+%{tde_libdir}/*.a
 
 
 %changelog
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
new file mode 100644
index 000000000..938db048f
--- /dev/null
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
@@ -0,0 +1,124 @@
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+# TDE 3.5.13 specific building variables
+%define tde_bindir %{_prefix}/bin
+%define tde_includedir %{_prefix}/include
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_libdir %{_prefix}/%{_lib}
+
+
+Name:		avahi-tqt
+Version:	3.5.13
+Release:	1%{?dist}%{?_variant}
+License:	GPL
+Summary:	Avahi TQT Interface
+Group:		System Environment/Libraries
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{name}-%{version}.tar.gz
+
+BuildRequires:	gcc-c++
+BuildRequires:	cmake >= 2.8
+BuildRequires:	qt3-devel >= 3.3.8.d
+BuildRequires:	tqtinterface-devel >= 3.5.13
+BuildRequires:	gettext-devel
+BuildRequires:	dbus-devel
+
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}avahi-client-devel
+BuildRequires:	%{_lib}expat1-devel
+Provides:		%{_lib}avahi-qt3
+%else
+BuildRequires:	avahi-devel
+BuildRequires:	expat-devel
+%endif
+
+Requires:		qt3 >= 3.3.8.d
+Requires:		tqtinterface >= 3.5.13
+
+Provides:		avahi-qt3
+
+%description
+Avahi TQT Interface
+
+
+%package devel
+Requires:	%{name}
+Summary:	%{name} - Development files
+Group:		Development/Libraries
+
+%if 0%{?mgaversion}
+Provides:		%{_lib}avahi-qt3-devel
+%endif
+
+%description devel
+Development files for %{name}
+
+
+%prep
+%setup -q -n dependencies/%{name}
+
+# 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" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
+
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "./ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "./ltmain.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/qt.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=%{_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --docdir=%{tde_docdir} \
+  --includedir=%{tde_includedir} \
+  --libdir=%{tde_libdir} \
+  --enable-compat-libdns_sd \
+  --with-systemdsystemunitdir=/lib/systemd/system  \
+  MOC_QT3=%{tde_bindir}/moc-tqt
+
+%__make %{?_smp_mflags}
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{?buildroot}
+
+%clean
+%__rm -rf %{?buildroot}
+
+
+%files
+%{tde_libdir}/*.so.*
+
+%files devel
+%{tde_includedir}/%{name}
+%{tde_libdir}/*.so
+%{tde_libdir}/*.la
+%{tde_libdir}/pkgconfig/*.pc
+%exclude %{tde_libdir}/libavahi-tqt.a
+
+%changelog
+* Mon Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
+- Initial build for TDE 3.5.13
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
index 125031f36..fbbb1c381 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
@@ -3,6 +3,10 @@
 %define _variant .opt
 %endif
 
+%define tde_bindir %{_prefix}/bin
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+
 Name:		dbus-1-tqt
 Version:	3.5.13
 Release:	1%{?dist}%{?_variant}
@@ -46,10 +50,14 @@ Development files for %{name}
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+%{?!mgaversion:%__mkdir build; cd build}
+%cmake \
+  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  ..
 
-%__mkdir build
-cd build
-%cmake ..
 %__make %{?_smp_mflags}
 
 
@@ -62,14 +70,14 @@ cd build
 %__rm -rf %{?buildroot}
 
 %files
-%{_bindir}/dbusxml2qt3
-%{_libdir}/*.so.*
+%{tde_bindir}/dbusxml2qt3
+%{tde_libdir}/*.so.*
 
 %files devel
-%{_includedir}/*.h
-%{_libdir}/*.so
-%{_libdir}/*.la
-%{_libdir}/pkgconfig/*.pc
+%{tde_includedir}/*.h
+%{tde_libdir}/*.so
+%{tde_libdir}/*.la
+%{tde_libdir}/pkgconfig/*.pc
 
 %changelog
 * Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
index 8020e2ee2..40247558e 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
@@ -3,6 +3,9 @@
 %define _variant .opt
 %endif
 
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+
 Name:		dbus-tqt
 Version:	3.5.13
 Release:	3%{?dist}%{?_variant}
@@ -28,7 +31,6 @@ BuildRequires:	qt3-devel >= 3.3.8.d
 
 Requires:		qt3 >= 3.3.8.d
 
-#Provides:		dbus-qt
 
 %description
 Dbus TQT Interface
@@ -49,10 +51,13 @@ Development files for %{name}
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-%__mkdir build
-cd build
-%cmake ..
+%{?!mgaversion:%__mkdir build; cd build}
+%cmake \
+  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  ..
 
 %__make %{?_smp_mflags}
 
@@ -66,13 +71,13 @@ cd build
 %__rm -rf %{?buildroot}
 
 %files
-%{_libdir}/*.so.*
+%{tde_libdir}/*.so.*
 
 %files devel
-%{_includedir}/dbus-1.0/*
-%{_libdir}/*.so
-%{_libdir}/*.la
-%{_libdir}/pkgconfig/*.pc
+%{tde_includedir}/dbus-1.0/*
+%{tde_libdir}/*.so
+%{tde_libdir}/*.la
+%{tde_libdir}/pkgconfig/*.pc
 
 %changelog
 * Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec
index eef45ba22..f75aa3119 100644
--- a/redhat/dependencies/libcaldav/libcaldav.spec
+++ b/redhat/dependencies/libcaldav/libcaldav.spec
@@ -3,9 +3,14 @@
 %define _variant .opt
 %endif
 
-Name:		libcaldav
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+
+Name:		trinity-libcaldav
 Version:	0.6.5
-Release:	2debian2.2%{?dist}%{?_variant}
+Release:	3%{?dist}%{?_variant}
 
 Vendor:		Trinity Project
 URL:		http://www.trinitydesktop.org/
@@ -24,12 +29,19 @@ BuildRequires:	glib2-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	make
 
+Obsoletes:	libcaldav < %{version}-%{release}
+Provides:	libcaldav = %{version}-%{release}
+
 %if 0%{?fedora} || 0%{?rhel} >= 6
 BuildRequires:	libcurl-devel
 %else
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}curl-devel
+%else
 # Specific CURL version for TDE on RHEL 5 (and older)
 BuildRequires:	trinity-libcurl-devel
 %endif
+%endif
 
 %description
 libcaldev is a client library that adds support for the CalDAV protocol (rfc4791).
@@ -39,18 +51,24 @@ easy to integrate CalDAV support into any PIM application.
 %package devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
-Requires:	%{name}
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:	libcaldav-devel < %{version}-%{release}
+Provides:	libcaldav-devel = %{version}-%{release}
 
 %description devel
 %{summary}
 
 
 %prep
-%setup -q
+%setup -q -n libcaldav-%{version}
 
 %build
 autoreconf --force --install --symlink
-%configure
+%configure \
+  --docdir=%{tde_docdir}/libcaldav \
+  --includedir=%{tde_includedir} \
+  --libdir=%{tde_libdir} \
+  
 %__make %{?_smp_mflags}
 
 %install
@@ -58,26 +76,30 @@ autoreconf --force --install --symlink
 %__make install DESTDIR=%{buildroot}
 
 # The include files do not go in the correct directory
-%__mv -f %{buildroot}%{_includedir}/%{name}-0.6.2/*.h %{buildroot}%{_includedir}
-%__rm -rf %{buildroot}%{_includedir}/%{name}-0.6.2
+%__mv -f %{buildroot}%{tde_includedir}/libcaldav-0.6.2/*.h %{buildroot}%{tde_includedir}
+%__rm -rf %{buildroot}%{tde_includedir}/libcaldav-0.6.2
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %files
-%{_libdir}/*.so.*
-%{_datadir}/doc/%{name}
+%{tde_libdir}/*.so.*
+%{tde_docdir}/libcaldav
 
 %files devel
-%{_includedir}/*.h
-%{_libdir}/*.a
-%{_libdir}/*.la
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/%{name}.pc
+%{tde_includedir}/*.h
+%{tde_libdir}/*.a
+%{tde_libdir}/*.la
+%{tde_libdir}/*.so
+%{tde_libdir}/pkgconfig/libcaldav.pc
 
 
 %Changelog
+* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3
+- Renames to 'trinity-libcaldav'
+- Build on MGA2
+
 * Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2.2
 - Add missing BuildRequires
 
diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec
index c47f40a49..c3ed99db0 100644
--- a/redhat/dependencies/libcarddav/libcarddav.spec
+++ b/redhat/dependencies/libcarddav/libcarddav.spec
@@ -3,9 +3,12 @@
 %define _variant .opt
 %endif
 
-Name:		libcarddav
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+
+Name:		trinity-libcarddav
 Version:	0.6.2
-Release:	2debian2.1%{?dist}%{?_variant}
+Release:	3%{?dist}%{?_variant}
 
 Vendor:		Trinity Project
 URL:		http://www.trinitydesktop.org/
@@ -22,8 +25,16 @@ Source0:	libcarddav_0.6.2-2debian2.tar.gz
 %if 0%{?fedora} || 0%{?rhel} >= 6
 BuildRequires:	libcurl-devel
 %else
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}curl-devel
+%else
+# Specific CURL version for TDE on RHEL 5 (and older)
 BuildRequires:	trinity-libcurl-devel
 %endif
+%endif
+
+Obsoletes:	libcarddav < %{version}-%{release}
+Provides:	libcarddav = %{version}-%{release}
 
 %description
 Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. 
@@ -35,16 +46,22 @@ Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	%{name}
 
+Obsoletes:	libcarddav-devel < %{version}-%{release}
+Provides:	libcarddav-devel = %{version}-%{release}
+
 %description devel
 %{summary}
 
 
 %prep
-%setup -q
+%setup -q -n libcarddav-%{version}
 
 %build
 autoreconf --force --install --symlink
-%configure
+%configure \
+  --includedir=%{tde_includedir} \
+  --libdir=%{tde_libdir} \
+  
 %__make %{?_smp_mflags}
 
 %install
@@ -52,24 +69,28 @@ autoreconf --force --install --symlink
 %__make install DESTDIR=%{buildroot}
 
 # The include files do not go in the correct directory
-%__mv -f %{buildroot}%{_includedir}/%{name}-0.6.1/*.h %{buildroot}%{_includedir}
-%__rm -rf %{buildroot}%{_includedir}/%{name}-0.6.1
+%__mv -f %{buildroot}%{tde_includedir}/libcarddav-0.6.1/*.h %{buildroot}%{tde_includedir}
+%__rm -rf %{buildroot}%{tde_includedir}/libcarddav-0.6.1
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %files
-%{_libdir}/*.so.*
+%{tde_libdir}/*.so.*
 
 %files devel
-%{_includedir}/*.h
-%{_libdir}/*.a
-%{_libdir}/*.la
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/%{name}.pc
+%{tde_includedir}/*.h
+%{tde_libdir}/*.a
+%{tde_libdir}/*.la
+%{tde_libdir}/*.so
+%{tde_libdir}/pkgconfig/libcarddav.pc
 
 
 %Changelog
+* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3
+- Renames to 'trinity-libcaldav'
+- Build on MGA2
+
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2 .1
 - Initial build for RHEL 6, RHEL 5, and Fedora 15
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
index 3da953661..721178df8 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
@@ -8,7 +8,9 @@
 
 # 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 _includedir %{_prefix}/include/tqt
+%define tde_bindir %{_prefix}/bin
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
 
 Name:		tqtinterface
 Version:	3.5.13
@@ -34,8 +36,12 @@ BuildRequires:	qt3-devel >= 3.3.8.d
 Requires:		qt3 >= 3.3.8.d
 
 BuildRequires:	gcc-c++
-BuildRequires:	libXi-devel
 BuildRequires:	pth-devel
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}xi-devel
+%else
+BuildRequires:	libXi-devel
+%endif
 
 
 %description
@@ -57,16 +63,15 @@ Development files for %{name}
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-%__mkdir build
-cd build
-%__cmake \
+%{?!mgaversion:%__mkdir build; cd build}
+%cmake \
   -DQT_PREFIX_DIR=${QTDIR} \
   -DQT_VERSION=3 \
   -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-  -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \
-  -DBIN_INSTALL_DIR=%{_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{_includedir} \
-  -DLIB_INSTALL_DIR=%{_libdir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_includedir}/tqt \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
   ..
 
 %__make %{?_smp_mflags}
@@ -87,21 +92,21 @@ done
 # Install 'cmake' modules for development use
 %__mkdir_p %{?buildroot}%{cmake_modules_dir}
 for i in cmake/modules/*.cmake; do
-  install -m 644 $i %{?buildroot}%{cmake_modules_dir}
+  %__install -m 644 $i %{?buildroot}%{cmake_modules_dir}
 done
 
 %clean
 %__rm -rf %{?buildroot}
 
 %files
-%{_bindir}/*
-%{_libdir}/*.so.*
+%{tde_bindir}/*
+%{tde_libdir}/*.so.*
 
 %files devel
-%{_includedir}
-%{_libdir}/*.so
-%{_libdir}/*.la
-%{_libdir}/pkgconfig/*.pc
+%{tde_includedir}/tqt
+%{tde_libdir}/*.so
+%{tde_libdir}/*.la
+%{tde_libdir}/pkgconfig/*.pc
 %{cmake_modules_dir}/*.cmake