RPM Packaging: massive update

13 files changed, 491 insertions, 99 deletions

diff --git a/redhat/dependencies/akode/akode-14.0.0.spec b/redhat/dependencies/akode/akode-14.0.0.spec
index 6c6ba8936..06231e7eb 100644
--- a/redhat/dependencies/akode/akode-14.0.0.spec
+++ b/redhat/dependencies/akode/akode-14.0.0.spec
@@ -41,6 +41,12 @@
 %define _variant .opt
 %endif
 
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define libakode %{_lib}akode
+%else
+%define libakode libakode
+%endif
+
 Name:		trinity-akode 
 Summary: 	Audio-decoding framework 
 Group: 		System Environment/Libraries
@@ -48,24 +54,31 @@ Epoch:		%{tde_epoch}
 Version:	2.0.2
 Release:	1%{?dist}%{?_variant}
 URL:		http://www.kde-apps.org/content/show.php?content=30375
-
-License:	LGPLv2+
 #URL:		http://carewolf.com/akode/  
 
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
 Source0:	akode-%{tde_version}.tar.gz
 
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:	cmake >= 2.8
+BuildRequires:  gcc-c++
+BuildRequires:	libtool
+
+# TQT support
+BuildRequires:	libtqt4-devel
+BuildRequires:	trinity-filesystem >= %{tde_version}
 
 # FLAC support
 %define _with_flac --with-flac
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
 BuildRequires: libflac-devel
-%else
-BuildRequires: %{_lib}flac-devel
-%endif
 %endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 BuildRequires: flac-devel
@@ -75,7 +88,7 @@ BuildRequires: flac-devel
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define _with_jack --with-jack
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}jack-devel
+BuildRequires: libjack-devel
 %endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 BuildRequires: jack-audio-connection-kit-devel
@@ -88,12 +101,11 @@ BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: libsamplerate-devel
 %endif
 
-%if 0
 # PULSEAUDIO support
 %if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define _with_pulseaudio --with-pulseaudio
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}pulseaudio-devel
+BuildRequires: libpulseaudio-devel
 %endif
 %if 0%{?rhel} || 0%{?fedora}
 BuildRequires: pulseaudio-libs-devel
@@ -102,21 +114,13 @@ BuildRequires: pulseaudio-libs-devel
 BuildRequires: pulseaudio-devel
 %endif
 %endif
-%endif
 
 # MAD support
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
 %define _with_libmad --with-libmad
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:		%{_lib}mad-devel
-%endif
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
 BuildRequires:		libmad-devel
 %endif
-%endif
 
-BuildRequires: cmake >= 2.8
-BuildRequires: libtool
 BuildRequires: alsa-lib-devel
 BuildRequires: libvorbis-devel
 BuildRequires: speex-devel
@@ -162,14 +166,15 @@ aKode also has the following audio outputs:
 Summary: Headers for developing programs that will use %{name} 
 Group:   Development/Libraries
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%{?_with_jack:Requires: %{name}-jack = %{?epoch:%{epoch}:}%{version}-%{release}}
-%{?_with_pulseaudio:Requires: %{name}-pulseaudio = %{?epoch:%{epoch}:}%{version}-%{release}}
-%{?_with_libsamplerate:Requires: %{name}-libsamplerate = %{?epoch:%{epoch}:}%{version}-%{release}}
-%{?_with_libmad:Requires: %{name}-libmad = %{?epoch:%{epoch}:}%{version}-%{release}}
+%{?_with_jack:Requires: %{libakode}_jack_sink = %{?epoch:%{epoch}:}%{version}-%{release}}
+%{?_with_pulseaudio:Requires: %{libakode}_polyp_sink = %{?epoch:%{epoch}:}%{version}-%{release}}
+%{?_with_libsamplerate:Requires: %{libakode}_src_resampler = %{?epoch:%{epoch}:}%{version}-%{release}}
+%{?_with_libmad:Requires: %{libakode}_mpeg_decoder  = %{?epoch:%{epoch}:}%{version}-%{release}}
 Requires: pkgconfig
 
 %description devel
 This package contains the development files for Akode.
+It is needed if you intend to build an application linked against Akode.
 
 %files devel
 %defattr(-,root,root,-)
@@ -177,7 +182,7 @@ This package contains the development files for Akode.
 %{_includedir}/*
 %{_libdir}/libakode.la
 %{_libdir}/libakode.so
-#%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/akode.pc
 
 %post devel
 /sbin/ldconfig
@@ -189,23 +194,24 @@ This package contains the development files for Akode.
 
 %if "%{?_with_jack}" != ""
 
-%package jack 
+%package -n %{libakode}_jack_sink
 Summary: Jack audio output backend for %{name}
 Group:   Development/Libraries
+Provides: libakode_jack_sink = %{version}-%{release}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description jack 
+%description -n %{libakode}_jack_sink
 This package contains the Jack audio output backend for Akode.
 
-%files jack 
+%files -n %{libakode}_jack_sink
 %defattr(-,root,root,-)
 %{_libdir}/libakode_jack_sink.la
 %{_libdir}/libakode_jack_sink.so
 
-%post jack
+%post -n %{libakode}_jack_sink
 /sbin/ldconfig
 
-%postun jack
+%postun -n %{libakode}_jack_sink
 /sbin/ldconfig
 
 %endif
@@ -214,24 +220,25 @@ This package contains the Jack audio output backend for Akode.
 
 %if "%{?_with_pulseaudio}" != ""
 
-%package pulseaudio
+%package -n %{libakode}_polyp_sink
 Summary: Pulseaudio output backend for %{name}
 Group:   Development/Libraries
+Provides: libakode_polyp_sink = %{version}-%{release}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description pulseaudio
+%description -n %{libakode}_polyp_sink
 This package contains the pulseaudio backend for Akode.
 Recommended for network transparent audio.
 
-%files pulseaudio
+%files -n %{libakode}_polyp_sink
 %defattr(-,root,root,-)
 %{_libdir}/libakode_polyp_sink.la
 %{_libdir}/libakode_polyp_sink.so
 
-%post pulseaudio
+%post -n %{libakode}_polyp_sink
 /sbin/ldconfig
 
-%postun pulseaudio
+%postun -n %{libakode}_polyp_sink
 /sbin/ldconfig
 
 %endif
@@ -241,25 +248,24 @@ Recommended for network transparent audio.
 # Packaged separately to keep main/core %{akode} package LGPL-clean.
 %if "%{?_with_libsamplerate:1}" == "1"
 
-%package libsamplerate 
+%package -n %{libakode}_src_resampler
 Summary: Resampler based on libsamplerate for %{name}
 Group:   Development/Libraries
-License: GPLv2+
+Provides: libakode_src_resampler = %{version}-%{release}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description libsamplerate 
+%description -n %{libakode}_src_resampler 
 This package contains the samplerate decoder for Akode.
 
-# License: GPLv2+
-%files libsamplerate
+%files -n %{libakode}_src_resampler
 %defattr(-,root,root,-)
 %{_libdir}/libakode_src_resampler.la
 %{_libdir}/libakode_src_resampler.so
 
-%post libsamplerate
+%post -n %{libakode}_src_resampler
 /sbin/ldconfig
 
-%postun libsamplerate 
+%postun -n %{libakode}_src_resampler 
 /sbin/ldconfig
 
 %endif
@@ -268,22 +274,24 @@ This package contains the samplerate decoder for Akode.
 
 %if "%{?_with_libmad}" != ""
 
-%package libmad
+%package -n %{libakode}_mpeg_decoder
 Summary: Decoder based on libmad for %{name}
 Group:   Development/Libraries
+Provides: libakode_mpeg_decoder = %{version}-%{release}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description libmad 
+%description -n %{libakode}_mpeg_decoder 
 This package contains the mad decoder for Akode.
 
-%files libmad
+%files -n %{libakode}_mpeg_decoder
+%defattr(-,root,root,-)
 %{_libdir}/libakode_mpeg_decoder.la
 %{_libdir}/libakode_mpeg_decoder.so
 
-%post libmad
+%post -n %{libakode}_mpeg_decoder
 /sbin/ldconfig
 
-%postun libmad 
+%postun -n %{libakode}_mpeg_decoder 
 /sbin/ldconfig
 
 %endif
@@ -297,7 +305,7 @@ This package contains the mad decoder for Akode.
 ##########
 
 %prep
-%setup -q -n akode
+%setup -q -n akode-2.0.2
 
 
 %build
@@ -323,7 +331,7 @@ fi
   -DWITH_LIBLTDL="OFF" \
   -DWITH_ALSA_SINK="ON" \
   %{!?_with_jack:-DWITH_JACK_SINK="OFF"} %{?_with_jack:-DWITH_JACK_SINK="ON"} \
-  %{!?_with_pulseaudio:-DWITH_POLYP_SINK="OFF"} %{?_with_pulseaudio:-DWITH_POLYP_SINK="ON"} \
+  %{!?_with_pulseaudio:-DWITH_PULSE_SINK="OFF"} %{?_with_pulseaudio:-DWITH_PULSE_SINK="ON"} \
   -DWITH_OSS_SINK="ON" \
   -DWITH_SUN_SINK="OFF" \
   \
@@ -337,21 +345,10 @@ fi
 %__make %{?_smp_mflags} || %__make
 
 
-#  %{?_with_flac} %{!?_with_flac:--without-flac} \
-#  %{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \
-#  --with-speex \
-#  --with-vorbis \
-#  --without-ffmpeg \
-#  %{?_with_libmad} %{!?_with_libmad:--without-libmad}
-
-
 %install
 %__rm -rf %{buildroot} 
 %__make install DESTDIR=%{?buildroot} -C build
 
-# unpackaged files
-#%__rm -f %{buildroot}%{tde_libdir}/*.a
-
 # rpmdocs
 for file in AUTHORS COPYING NEWS README TODO ; do
   test -s  "$file" && install -p -m644 -D "$file" "rpmdocs/$file"
diff --git a/redhat/dependencies/akode/akode-3.5.13.2.spec b/redhat/dependencies/akode/akode-3.5.13.2.spec
index 89b2546e3..57c5ed631 100644
--- a/redhat/dependencies/akode/akode-3.5.13.2.spec
+++ b/redhat/dependencies/akode/akode-3.5.13.2.spec
@@ -21,7 +21,9 @@
 
 # TDE variables
 %define tde_epoch 1
+%if "%{?tde_version}" == ""
 %define tde_version 3.5.13.2
+%endif
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -46,24 +48,32 @@ Epoch:		%{tde_epoch}
 Version:	2.0.2
 Release:	1%{?dist}%{?_variant}
 URL:		http://www.kde-apps.org/content/show.php?content=30375
-
-License:	LGPLv2+
 #URL:		http://carewolf.com/akode/  
 
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
 Source0:	akode-%{tde_version}.tar.gz
 
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:  gcc-c++
+BuildRequires:	libtool
+
+# TQT support
+BuildRequires:	libtqt4-devel
+BuildRequires:	trinity-filesystem >= %{tde_version}
 
 # FLAC support
 %define _with_flac --with-flac
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
 BuildRequires: libflac-devel
-%else
-BuildRequires: %{_lib}flac-devel
-%endif
 %endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 BuildRequires: flac-devel
@@ -73,7 +83,7 @@ BuildRequires: flac-devel
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define _with_jack --with-jack
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}jack-devel
+BuildRequires: libjack-devel
 %endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 BuildRequires: jack-audio-connection-kit-devel
@@ -90,7 +100,7 @@ BuildRequires: libsamplerate-devel
 %if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define _with_pulseaudio --with-pulseaudio
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}pulseaudio-devel
+BuildRequires: libpulseaudio-devel
 %endif
 %if 0%{?rhel} || 0%{?fedora}
 BuildRequires: pulseaudio-libs-devel
@@ -103,16 +113,9 @@ BuildRequires: pulseaudio-devel
 # MAD support
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
 %define _with_libmad --with-libmad
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:		%{_lib}mad-devel
-%endif
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
 BuildRequires:		libmad-devel
 %endif
-%endif
-
 
-BuildRequires: automake libtool
 BuildRequires: alsa-lib-devel
 BuildRequires: libvorbis-devel
 BuildRequires: speex-devel
@@ -166,6 +169,7 @@ Requires: pkgconfig
 
 %description devel
 This package contains the development files for Akode.
+It is needed if you intend to build an application linked against Akode.
 
 %files devel
 %defattr(-,root,root,-)
@@ -240,13 +244,11 @@ Recommended for network transparent audio.
 %package libsamplerate 
 Summary: Resampler based on libsamplerate for %{name}
 Group:   Development/Libraries
-License: GPLv2+
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description libsamplerate 
 This package contains the samplerate decoder for Akode.
 
-# License: GPLv2+
 %files libsamplerate
 %defattr(-,root,root,-)
 %{tde_libdir}/libakode_src_resampler.la
@@ -273,6 +275,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 This package contains the mad decoder for Akode.
 
 %files libmad
+%defattr(-,root,root,-)
 %{tde_libdir}/libakode_mpeg_decoder.la
 %{tde_libdir}/libakode_mpeg_decoder.so
 
@@ -301,6 +304,7 @@ This package contains the mad decoder for Akode.
 
 
 %build
+unset QTDIR QTINC QTLIB
 export CXXFLAGS="${RPM_OPT_FLAGS} -DHAVE_STDINT_H"
 
 %configure \
@@ -328,12 +332,12 @@ export CXXFLAGS="${RPM_OPT_FLAGS} -DHAVE_STDINT_H"
   --without-ffmpeg \
   %{?_with_libmad} %{!?_with_libmad:--without-libmad}
 
-%__make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 %__rm -rf %{buildroot} 
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{?buildroot}
 
 # unpackaged files
 %__rm -f %{buildroot}%{tde_libdir}/*.a
diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index d2efe1cc2..3aa4af46e 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -27,6 +27,7 @@
 %define tde_pkg arts
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
@@ -233,7 +234,7 @@ intended for systems running the Pulseaudio server.
 
 %files config-pulseaudio
 %defattr(-,root,root,-)
-%{tde_datadir}/config/kcmartsrc
+%{tde_confdir}/kcmartsrc
 
 %endif
 
@@ -295,13 +296,14 @@ fi
 
 # Installs the Pulseaudio configuration file
 %if 0%{?with_pulseaudio}
-cat <<EOF >"%{?buildroot}%{tde_datadir}/config/kcmartsrc"
+%__mkdir_p "%{?buildroot}%{tde_confdir}"
+cat <<EOF >"%{?buildroot}%{tde_confdir}/kcmartsrc"
 [Arts]
 Arguments=\s-F 10 -S 4096 -a esd -n -s 1 -m artsmessage -c drkonqi -l 3 -f
 NetworkTransparent=true
 SuspendTime=1
 EOF
-chmod 644 "%{?buildroot}%{tde_datadir}/config/kcmartsrc"
+chmod 644 "%{?buildroot}%{tde_confdir}/kcmartsrc"
 %endif
 
 # Add supplementary folders
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 9b7d4c79f..40c63bd21 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -67,7 +67,7 @@ BuildRequires:	gettext-devel
 BuildRequires:	xorg-x11-devel
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xi-devel
+BuildRequires:	libxi-devel
 %endif
 %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
 BuildRequires:	libXi-devel
@@ -89,7 +89,7 @@ BuildRequires:	libcap-devel
 
 # AVAHI support
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%define avahi_devel %{_lib}avahi-client-devel
+%define avahi_devel libavahi-client-devel
 %endif
 %if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
 %define avahi_devel avahi-devel
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 cb952ce0b..2b73e6646 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
@@ -114,6 +114,12 @@ Requires:		%{libdbus}-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes:		trinity-dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:		trinity-dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
+%if 0%{?suse_version}
+Requires:	dbus-1-devel
+%else
+Requires:	dbus-devel
+%endif
+
 %description -n %{libdbus}-1-tqt-devel
 D-BUS is a message bus, used for sending messages between applications.
 Conceptually, it fits somewhere in between raw sockets and CORBA in
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 05b00abd0..fa7639fc1 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
@@ -115,6 +115,12 @@ Requires:		%{libdbus}-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes:		trinity-dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:		trinity-dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
+%if 0%{?suse_version}
+Requires:	dbus-1-devel
+%else
+Requires:	dbus-devel
+%endif
+
 %description -n %{libdbus}-tqt-1-devel
 D-BUS is a message bus, used for sending messages between applications.
 Conceptually, it fits somewhere in between raw sockets and CORBA in
diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
index 9a6a9a6ff..3c060415d 100644
--- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
+++ b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
@@ -54,6 +54,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
+Patch1:		libcaldav-14.0.1-rhel5.patch
+
 BuildRequires:	make
 BuildRequires:	libtool
 BuildRequires:	fdupes
@@ -67,15 +69,10 @@ BuildRequires:	gtk2-devel
 %endif
 
 # CURL support
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%define libcurl_devel libcurl-devel
-%else
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define libcurl_devel %{_lib}curl-devel
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+%define libcurl_devel libcurl-devel >= 7.15.5
 %else
-# Specific CURL version for TDE on RHEL 5 (and older)
-#define libcurl_devel trinity-libcurl-devel
-%endif
+%define libcurl_devel curl-devel >= 7.15.5
 %endif
 %{?libcurl_devel:BuildRequires: %{libcurl_devel}}
 
@@ -154,7 +151,10 @@ This package includes the development files.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-./autogen.sh
+%if 0%{?rhel} == 5
+%patch1 -p1 -b .ftbfs
+%endif
+autoreconf -fiv
 
 
 %build
diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch b/redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch
new file mode 100644
index 000000000..0cf9f056b
--- /dev/null
+++ b/redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch
@@ -0,0 +1,193 @@
+diff --git a/src/add-caldav-object.c b/src/add-caldav-object.c
+index 68a4377..35aef48 100644
+--- a/src/add-caldav-object.c
++++ b/src/add-caldav-object.c
+@@ -103,7 +103,6 @@ gboolean caldav_add(caldav_settings* settings, caldav_error* error) {
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	if (res != 0) {
+ 		error->code = -1;
+diff --git a/src/delete-caldav-object.c b/src/delete-caldav-object.c
+index 9a85168..ea5733f 100644
+--- a/src/delete-caldav-object.c
++++ b/src/delete-caldav-object.c
+@@ -150,7 +150,6 @@ gboolean caldav_delete(caldav_settings* settings, caldav_error* error) {
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	g_free(search);
+ 	curl_slist_free_all(http_header);
+@@ -249,7 +248,6 @@ gboolean caldav_delete(caldav_settings* settings, caldav_error* error) {
+ 					curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
+ 					curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 					curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-					curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 					res = curl_easy_perform(curl);
+ 					if (LOCKSUPPORT && lock_token) {
+ 						caldav_unlock_object(
+@@ -380,7 +378,6 @@ gboolean caldav_tasks_delete(caldav_settings* settings, caldav_error* error) {
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	g_free(search);
+ 	curl_slist_free_all(http_header);
+@@ -479,7 +476,6 @@ gboolean caldav_tasks_delete(caldav_settings* settings, caldav_error* error) {
+ 					curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
+ 					curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 					curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-					curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 					res = curl_easy_perform(curl);
+ 					if (LOCKSUPPORT && lock_token) {
+ 						caldav_unlock_object(
+diff --git a/src/get-caldav-report.c b/src/get-caldav-report.c
+index d916259..0021cb8 100644
+--- a/src/get-caldav-report.c
++++ b/src/get-caldav-report.c
+@@ -169,7 +169,6 @@ gboolean caldav_getall(caldav_settings* settings, caldav_error* error) {
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	if (res != 0) {
+ 		error->code = -1;
+@@ -266,7 +265,6 @@ gboolean caldav_getrange(caldav_settings* settings, caldav_error* error) {
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	if (res != 0) {
+ 		error->code = -1;
+@@ -349,7 +347,6 @@ gboolean caldav_tasks_getall(caldav_settings* settings, caldav_error* error) {
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	if (res != 0) {
+ 		error->code = -1;
+@@ -446,7 +443,6 @@ gboolean caldav_tasks_getrange(caldav_settings* settings, caldav_error* error) {
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	if (res != 0) {
+ 		error->code = -1;
+diff --git a/src/get-display-name.c b/src/get-display-name.c
+index 8fc0ff8..c205efd 100644
+--- a/src/get-display-name.c
++++ b/src/get-display-name.c
+@@ -99,7 +99,6 @@ gboolean caldav_getname(caldav_settings* settings, caldav_error* error) {
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	if (res != 0) {
+ 		error->code = -1;
+diff --git a/src/get-freebusy-report.c b/src/get-freebusy-report.c
+index f75ab92..40a5a3c 100644
+--- a/src/get-freebusy-report.c
++++ b/src/get-freebusy-report.c
+@@ -104,7 +104,6 @@ gboolean caldav_freebusy(caldav_settings* settings, caldav_error* error) {
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	if (res != 0) {
+ 		error->code = -1;
+diff --git a/src/lock-caldav-object.c b/src/lock-caldav-object.c
+index 30f2d20..6845551 100644
+--- a/src/lock-caldav-object.c
++++ b/src/lock-caldav-object.c
+@@ -107,7 +107,6 @@ gchar* caldav_lock_object(
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "LOCK");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	curl_slist_free_all(http_header);
+ 	if (res != 0) {
+@@ -211,7 +210,6 @@ gboolean caldav_unlock_object(gchar* lock_token, gchar* URI,
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "UNLOCK");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	curl_slist_free_all(http_header);
+ 	if (res != 0) {
+diff --git a/src/modify-caldav-object.c b/src/modify-caldav-object.c
+index fb3a4d0..f3563d8 100644
+--- a/src/modify-caldav-object.c
++++ b/src/modify-caldav-object.c
+@@ -151,7 +151,6 @@ gboolean caldav_modify(caldav_settings* settings, caldav_error* error) {
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	curl_slist_free_all(http_header);
+ 	http_header = NULL;
+@@ -249,7 +248,6 @@ gboolean caldav_modify(caldav_settings* settings, caldav_error* error) {
+ 									strlen(settings->file));
+ 						curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 						curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-						curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 						curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
+ 						res = curl_easy_perform(curl);
+ 						if (LOCKSUPPORT && lock_token) {
+@@ -391,7 +389,6 @@ gboolean caldav_tasks_modify(caldav_settings* settings, caldav_error* error) {
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	curl_slist_free_all(http_header);
+ 	http_header = NULL;
+@@ -489,7 +486,6 @@ gboolean caldav_tasks_modify(caldav_settings* settings, caldav_error* error) {
+ 									strlen(settings->file));
+ 						curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 						curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-						curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 						curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
+ 						res = curl_easy_perform(curl);
+ 						if (LOCKSUPPORT && lock_token) {
+diff --git a/src/options-caldav-server.c b/src/options-caldav-server.c
+index 1d97d04..0045afe 100644
+--- a/src/options-caldav-server.c
++++ b/src/options-caldav-server.c
+@@ -74,7 +74,6 @@ gboolean caldav_getoptions(CURL* curl, caldav_settings* settings, response* resu
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "OPTIONS");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	if (res == 0) {
+ 		gchar* head;
+@@ -102,15 +101,12 @@ gboolean caldav_getoptions(CURL* curl, caldav_settings* settings, response* resu
+ 	}
+ 	else if (
+ 		(res == CURLE_SSL_CONNECT_ERROR ||
+-		 CURLE_PEER_FAILED_VERIFICATION ||
+ 		 CURLE_SSL_ENGINE_NOTFOUND ||
+ 		 CURLE_SSL_ENGINE_SETFAILED ||
+ 		 CURLE_SSL_CERTPROBLEM ||
+ 		 CURLE_SSL_CIPHER ||
+ 		 CURLE_SSL_CACERT ||
+-		 CURLE_SSL_CACERT_BADFILE ||
+-		 CURLE_SSL_CRL_BADFILE ||
+-		 CURLE_SSL_ISSUER_ERROR) && settings->usehttps) {
++		 CURLE_SSL_CRL_BADFILE ) && settings->usehttps) {
+ 		error->code = -2;
+ 		error->str = g_strdup(error_buf);
+ 	}
diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
index 7faa4cf44..2e99ae603 100644
--- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
@@ -54,19 +54,17 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
+Patch1:		libcarddav-14.0.1-rhel5.patch
+
 BuildRequires:	make
 BuildRequires:	libtool
 
 # CURL support
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%define libcurl_devel libcurl-devel
-%else
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define libcurl_devel %{_lib}curl-devel
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+%define libcurl_devel libcurl-devel >= 7.15.5
 %else
 # Specific CURL version for TDE on RHEL 5 (and older)
-#define libcurl_devel trinity-libcurl-devel
-%endif
+%define libcurl_devel curl-devel >= 7.15.5
 %endif
 %{?libcurl_devel:BuildRequires: %{libcurl_devel}}
 
@@ -153,11 +151,14 @@ This package contains the development files.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%if 0%{?rhel} == 5
+%patch1 -p1 -b .ftbfs
+%endif
 
 # Fix empty ChangeLog cause invalid macro in 'configure.ac'
 echo "%{name} (%{version})" >ChangeLog
 
-./autogen.sh
+autoreconf -fiv
 
 
 %build
diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch b/redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch
new file mode 100644
index 000000000..a6bf4e6e0
--- /dev/null
+++ b/redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch
@@ -0,0 +1,164 @@
+diff --git a/src/add-carddav-object.c b/src/add-carddav-object.c
+index 5574991..a1586d8 100644
+--- a/src/add-carddav-object.c
++++ b/src/add-carddav-object.c
+@@ -104,7 +104,6 @@ gboolean carddav_add(carddav_settings* settings, carddav_error* error) {
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	if (res != 0) {
+ 		error->code = -1;
+diff --git a/src/delete-carddav-object.c b/src/delete-carddav-object.c
+index 96b9033..6984a82 100644
+--- a/src/delete-carddav-object.c
++++ b/src/delete-carddav-object.c
+@@ -132,7 +132,6 @@ gboolean carddav_delete(carddav_settings* settings, carddav_error* error) {
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	g_free(search);
+ 	curl_slist_free_all(http_header);
+@@ -231,7 +230,6 @@ gboolean carddav_delete(carddav_settings* settings, carddav_error* error) {
+ 					curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
+ 					curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 					curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-					curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 					res = curl_easy_perform(curl);
+ 					if (LOCKSUPPORT && lock_token) {
+ 						carddav_unlock_object(
+@@ -417,7 +415,6 @@ gboolean carddav_delete_by_uri(carddav_settings* settings, carddav_error* error)
+ 			curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
+ 			curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 			curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-			curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 			res = curl_easy_perform(curl);
+ 			if (LOCKSUPPORT && lock_token) {
+ 				carddav_unlock_object(
+diff --git a/src/get-carddav-report.c b/src/get-carddav-report.c
+index b44fd2c..7655b29 100644
+--- a/src/get-carddav-report.c
++++ b/src/get-carddav-report.c
+@@ -117,7 +117,6 @@ static gchar* carddav_dirlist(carddav_settings* settings, carddav_error* error)
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	if (res != 0) {
+ 		error->code = -1;
+@@ -243,7 +242,6 @@ gboolean carddav_getall(carddav_settings* settings, carddav_error* error) {
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	if (res != 0) {
+ 		error->code = -1;
+@@ -345,7 +343,6 @@ gboolean carddav_getall_by_uri(carddav_settings* settings, carddav_error* error)
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	if (res != 0) {
+ 		error->code = -1;
+@@ -378,4 +375,4 @@ gboolean carddav_getall_by_uri(carddav_settings* settings, carddav_error* error)
+ 	curl_easy_cleanup(curl);
+ 	g_free(dav_file_listing);
+ 	return result;
+-}
+\ No newline at end of file
++}
+diff --git a/src/get-display-name.c b/src/get-display-name.c
+index 9e782e0..16c3e4b 100644
+--- a/src/get-display-name.c
++++ b/src/get-display-name.c
+@@ -100,7 +100,6 @@ gboolean carddav_getname(carddav_settings* settings, carddav_error* error) {
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	if (res != 0) {
+ 		error->code = -1;
+diff --git a/src/lock-carddav-object.c b/src/lock-carddav-object.c
+index 163264c..2292cad 100644
+--- a/src/lock-carddav-object.c
++++ b/src/lock-carddav-object.c
+@@ -109,7 +109,6 @@ gchar* carddav_lock_object(
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "LOCK");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	curl_slist_free_all(http_header);
+ 	if (res != 0) {
+@@ -214,7 +213,6 @@ gboolean carddav_unlock_object(gchar* lock_token, gchar* URI,
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "UNLOCK");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	curl_slist_free_all(http_header);
+ 	if (res != 0) {
+diff --git a/src/modify-carddav-object.c b/src/modify-carddav-object.c
+index 1822068..a8b6de2 100644
+--- a/src/modify-carddav-object.c
++++ b/src/modify-carddav-object.c
+@@ -133,7 +133,6 @@ gboolean carddav_modify(carddav_settings* settings, carddav_error* error) {
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	curl_slist_free_all(http_header);
+ 	http_header = NULL;
+@@ -231,7 +230,6 @@ gboolean carddav_modify(carddav_settings* settings, carddav_error* error) {
+ 									strlen(settings->file));
+ 						curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 						curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-						curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 						curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
+ 						res = curl_easy_perform(curl);
+ 						if (LOCKSUPPORT && lock_token) {
+@@ -430,7 +428,6 @@ gboolean carddav_modify_by_uri(carddav_settings* settings, carddav_error* error)
+ 							strlen(settings->file));
+ 				curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 				curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-				curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 				curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
+ 				res = curl_easy_perform(curl);
+ 				if (LOCKSUPPORT && lock_token) {
+diff --git a/src/options-carddav-server.c b/src/options-carddav-server.c
+index b774401..b44aae2 100644
+--- a/src/options-carddav-server.c
++++ b/src/options-carddav-server.c
+@@ -75,7 +75,6 @@ gboolean carddav_getoptions(CURL* curl, carddav_settings* settings, response* re
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "OPTIONS");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	if (settings->debug) {
+ 		curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+ 	}
+@@ -106,15 +105,12 @@ gboolean carddav_getoptions(CURL* curl, carddav_settings* settings, response* re
+ 	}
+ 	else if (
+ 		(res == CURLE_SSL_CONNECT_ERROR ||
+-		 CURLE_PEER_FAILED_VERIFICATION ||
+ 		 CURLE_SSL_ENGINE_NOTFOUND ||
+ 		 CURLE_SSL_ENGINE_SETFAILED ||
+ 		 CURLE_SSL_CERTPROBLEM ||
+ 		 CURLE_SSL_CIPHER ||
+ 		 CURLE_SSL_CACERT ||
+-		 CURLE_SSL_CACERT_BADFILE ||
+-		 CURLE_SSL_CRL_BADFILE ||
+-		 CURLE_SSL_ISSUER_ERROR) && settings->usehttps) {
++		 CURLE_SSL_CRL_BADFILE ) && settings->usehttps) {
+ 		error->code = -2;
+ 		error->str = g_strdup(error_buf);
+ 	}
diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec
index 23bee37b8..127761a45 100644
--- a/redhat/dependencies/tqca/tqca-14.0.0.spec
+++ b/redhat/dependencies/tqca/tqca-14.0.0.spec
@@ -150,12 +150,18 @@ unset QTDIR QTINC QTLIB
   --qtdir=/usr \
   --debug
 
+
+# Workaround strange tqmake behaviour in RHEL5
+%if 0%{?rhel} == 5
+%__sed -i "Makefile" -e "s|..\/..\/..\/..|%{_prefix}|g"
+%endif
+
 %__make %{?_smp_mflags}
 
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
-%__make install INSTALL_ROOT=$RPM_BUILD_ROOT
+%__make install INSTALL_ROOT="${RPM_BUILD_ROOT}/"
 
 
 %clean
diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
index 52e6316d5..96a2a05cb 100644
--- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
+++ b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
@@ -174,6 +174,11 @@ export QTDIR=%{_libdir}/tqt3
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
+# Workaround strange tqmake behaviour in RHEL5
+%if 0%{?rhel} == 5
+%__sed -i "qt/Makefile" -e "s|..\/..\/..\/..\/..|%{_prefix}|g"
+%endif
+
 %__make %{?_smp_mflags} -C qt
 %__make %{?_smp_mflags} -C designer
 
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index cb6af234c..d1e710d45 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -136,8 +136,12 @@ BuildRequires: cups-devel
 %define xrandr_devel libXrandr-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?pclinuxos}
+%define xrandr_devel libxrandr2-devel
+%else
 %define xrandr_devel libxrandr-devel
 %endif
+%endif
 %{?xrandr_devel:BuildRequires: %{xrandr_devel}}
 
 # Xcursor support
@@ -248,8 +252,12 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?pclinuxos}
+BuildRequires: MesaGLU-devel
+%else
 BuildRequires: mesaglu-devel
 %endif
+%endif
 %if 0%{?suse_version}
 BuildRequires: Mesa-libGL-devel
 BuildRequires: Mesa-libGLU-devel