8 files changed, 288 insertions, 5 deletions
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
index 7657a1bdc..ecee40f36 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
@@ -118,6 +118,5 @@ cd build
 
 
 %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 R14.0.0
diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
new file mode 100644
index 000000000..fbe3bf8d2
--- /dev/null
+++ b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
@@ -0,0 +1,142 @@
+# 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 14.0.0
+
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+
+Name:		trinity-libcaldav
+Version:	0.6.5
+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 client library that adds support for the CalDAV protocol (rfc4791).
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	libtool
+%if 0%{?rhel} == 4
+BuildRequires:	evolution28-gtk2-devel
+%else
+BuildRequires:	glib2-devel
+BuildRequires:	gtk2-devel
+%endif
+BuildRequires:	make
+
+Obsoletes:	libcaldav < %{version}-%{release}
+Provides:	libcaldav = %{version}-%{release}
+
+%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
+
+%description
+libcaldev is a client library that adds support for the CalDAV protocol (rfc4791).
+The object is to have a library which fully implements the protocol so that it is
+easy to integrate CalDAV support into any PIM application.
+
+%package devel
+Summary:	Development files for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+Obsoletes:	libcaldav-devel < %{version}-%{release}
+Provides:	libcaldav-devel = %{version}-%{release}
+
+%description devel
+%{summary}
+
+%if 0%{?suse_version} || 0%{?pclinuxos}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+./autogen.sh
+
+
+%build
+# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
+export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${CFLAGS}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if [ -d /usr/evolution28 ]; then
+  export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
+fi
+
+%configure \
+  --docdir=%{tde_docdir}/libcaldav \
+  --includedir=%{tde_includedir} \
+  --libdir=%{tde_libdir} \
+  
+%__make %{?_smp_mflags}
+
+%install
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%__rm -f %{buildroot}%{tde_libdir}/*.a
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{tde_libdir}/libcaldav.so.*
+%{tde_docdir}/libcaldav/
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_includedir}/libcaldav/caldav.h
+%{tde_libdir}/libcaldav.la
+%{tde_libdir}/libcaldav.so
+%{tde_libdir}/pkgconfig/libcaldav.pc
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+%post devel
+/sbin/ldconfig
+
+%postun devel
+/sbin/ldconfig
+
+
+%Changelog
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.5-4
+- Initial release for TDE R14.0.0
+
+* 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
+
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2.1
+- Initial release for RHEL 6, RHEL 5, and Fedora 15
diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec
index f792bb98d..f792bb98d 100644
--- a/redhat/dependencies/libcaldav/libcaldav.spec
+++ b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec
diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
new file mode 100644
index 000000000..42ba6579e
--- /dev/null
+++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
@@ -0,0 +1,134 @@
+# 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 14.0.0
+
+%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:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+
+%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 %{name}-%{tde_version}%{?preversion:~%{preversion}}
+./autogen.sh
+
+
+%build
+# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
+export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${CFLAGS}"
+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 \
+  --includedir=%{tde_includedir} \
+  --libdir=%{tde_libdir} \
+  
+%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
+
+%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}/libcarddav/
+%{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
+* 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 release for RHEL 6, RHEL 5, and Fedora 15
diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav-3.5.12.spec
index 3bb4deca1..3bb4deca1 100644
--- a/redhat/dependencies/libcarddav/libcarddav.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-3.5.12.spec
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 1e33edf24..e86012b01 100644
--- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
+++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
@@ -29,10 +29,16 @@ Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Patch0:		python-tqt-14.0.0-ftbfs.patch
 
 BuildRequires:	gcc-c++
-BuildRequires:	python-sip
 BuildRequires:	trinity-tqtinterface-devel >= %{version}
 BuildRequires:	trinity-tqscintilla-devel
 
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	sip-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	python-sip
+%endif
+
 # TDE specific building variables
 BuildRequires:	cmake >= 2.8
 BuildRequires:	trinity-tqt3-devel >= 3.5.0
diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec
index 7d46981ae..083cfcf91 100644
--- a/redhat/dependencies/tqca/tqca-14.0.0.spec
+++ b/redhat/dependencies/tqca/tqca-14.0.0.spec
@@ -17,7 +17,7 @@
 
 Name:           trinity-tqca
 Version:        1.0
-Release:        3%{?dist}%{?_variant}
+Release:		%{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
 
 Summary:        TQt Cryptographic Architecture
 
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 2b178e846..9c7169d79 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -262,7 +262,9 @@ This package contains a graphical configuration tool for programs using TQt 3.
 %package devel
 Summary: Development files for the TQt 3 GUI toolkit
 Group: Development/Libraries
+
 Requires: %{name} = %{version}-%{release}
+Requires: %{name}-designer = %{version}-%{release}
 
 %description devel
 The %{name}-devel package contains the files necessary to develop