RPM: merge redhat directory with master branch

16 files changed, 732 insertions, 388 deletions

diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec
new file mode 100644
index 000000000..6f953fb06
--- /dev/null
+++ b/redhat/libraries/kipi-plugins/kipi-plugins.spec
@@ -0,0 +1,388 @@
+#
+# spec file for package kipi-plugins (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.0
+%endif
+%define tde_pkg kipi-plugins
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define kipi-plugins %{_lib}kipi
+%else
+%define kipi-plugins kipi-plugins
+%endif
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.1.6
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Image manipulation/handling plugins for KIPI aware programs [Trinity]
+Group:		System/Libraries
+URL:		http://www.trinitydesktop.org/
+#URL:		http://www.kipi-plugins.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdepim-devel >= %{tde_version}
+BuildRequires: trinity-libkdcraw-devel >= %{tde_version}
+BuildRequires: trinity-libkexiv2-devel >= %{tde_version}
+BuildRequires: trinity-libkipi-devel >= %{tde_version}
+
+BuildRequires: desktop-file-utils
+BuildRequires: pkgconfig
+BuildRequires: gettext
+BuildRequires: gcc-c++
+
+# JPEG support
+BuildRequires: libjpeg-devel
+
+# EXIV2
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}exiv2-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires:	exiv2-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	libexiv2-devel
+%endif
+
+# GPOD (ipod) support
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%define with_gpod 1
+BuildRequires:	libgpod-devel >= 0.4.2
+%endif
+
+# LCMS support
+%if 0%{?suse_version} || 0%{?rhel} >= 7
+BuildRequires: liblcms-devel
+%else
+BuildRequires: lcms-devel
+%endif
+
+# GPHOTO2 support
+%if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	gphoto2-devel
+%else
+BuildRequires:	libgphoto2-devel
+%endif
+
+# TIFF support
+BuildRequires:	libtiff-devel
+
+# XSLT support
+BuildRequires:	libxslt-devel
+
+# MESA support
+%if 0%{?rhel} || 0%{?fedora}
+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
+%endif
+
+# AUTOTOOLS
+BuildRequires: automake autoconf libtool
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}ltdl-devel
+%endif
+%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220
+BuildRequires:	libtool-ltdl-devel
+%endif
+
+%description
+KIPI plugins (TDE Image Plugin Interface) is an effort to develop a
+common plugin structure for Digikam, KPhotoAlbum (formerly known as
+KimDaBa), Showimg and Gwenview.
+Its aim is to share image plugins among graphic applications.
+
+Plugins available are:
+
+RawConverter:        Raw image converter for digital cameras
+SlideShow:           Slideshow with effects ripped out from kslideshow
+                     and 3D effects using OpenGL
+MpegEncoder:         Create an MPEG slideshow from your images
+PrintWizard:         A wizard to print images in various format
+JpegLossLess:        Batch process your JPEG images without losing meta
+                     information and compression
+CdArchiving:         Archive your albums on CD or DVD using K3b
+ScanImages:          Scanner management using Kooka
+ScreenshotImages:    Snap screen based on KSnapshot and adapted to Kipi
+Calendar:            Sreate calendars with images
+SendImages:          Send images by email, allowing resizing
+                     and recompressing before sending
+RenameImages:        Batch image renamer
+ConvertImages:       Batch image converter
+BorderImages:        Add border to your images in batch
+FilterImages:        Batch image enhancer using digital filters
+ColorImages:         Batch image color enhancer
+EffectImages:        Batch image transformation effects
+ResizeImages:        Batch image resizer
+RecompressImages:    Batch image recompressor
+FindDuplicateImages: Find duplicate images in albums
+TimeAdjust:          Adjust image file time and date
+WallPaper:           Set your image as wallpaper
+FindImages:          Find duplicate images in albums
+GalleryExport:       Interface for export images collections to remote
+                     Gallery (and Gallery 2) servers
+FlickrExport:        Export images to a remote Flickr web service
+HTMLGallery:         Export images to HTML
+SimpleviewerExport:  Export images in a nice flash movie
+GPSSync:             Geolocalize pictures
+MetadataEdit:        Edit EXIF and IPTC pictures metadata
+%if 0%{?with_gpod}
+IpodExport:          Export images to an ipod device
+%endif
+PicasaWebExport:     Export pictures to Picasa web service
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/images2mpg
+%{tde_libdir}/libkipiplugins.la
+%{tde_libdir}/libkipiplugins.so
+%{tde_libdir}/libkipiplugins.so.0
+%{tde_libdir}/libkipiplugins.so.0.0.1
+%{tde_tdelibdir}/kipiplugin_acquireimages.la
+%{tde_tdelibdir}/kipiplugin_acquireimages.so
+%{tde_tdelibdir}/kipiplugin_batchprocessimages.la
+%{tde_tdelibdir}/kipiplugin_batchprocessimages.so
+%{tde_tdelibdir}/kipiplugin_calendar.la
+%{tde_tdelibdir}/kipiplugin_calendar.so
+%{tde_tdelibdir}/kipiplugin_cdarchiving.la
+%{tde_tdelibdir}/kipiplugin_cdarchiving.so
+%{tde_tdelibdir}/kipiplugin_findimages.la
+%{tde_tdelibdir}/kipiplugin_findimages.so
+%{tde_tdelibdir}/kipiplugin_flickrexport.la
+%{tde_tdelibdir}/kipiplugin_flickrexport.so
+%{tde_tdelibdir}/kipiplugin_galleryexport.la
+%{tde_tdelibdir}/kipiplugin_galleryexport.so
+%{tde_tdelibdir}/kipiplugin_gpssync.la
+%{tde_tdelibdir}/kipiplugin_gpssync.so
+%{tde_tdelibdir}/kipiplugin_htmlexport.la
+%{tde_tdelibdir}/kipiplugin_htmlexport.so
+%if 0%{?with_gpod}
+%{tde_tdelibdir}/kipiplugin_ipodexport.la
+%{tde_tdelibdir}/kipiplugin_ipodexport.so
+%endif
+%{tde_tdelibdir}/kipiplugin_jpeglossless.la
+%{tde_tdelibdir}/kipiplugin_jpeglossless.so
+%{tde_tdelibdir}/kipiplugin_kameraklient.la
+%{tde_tdelibdir}/kipiplugin_kameraklient.so
+%{tde_tdelibdir}/kipiplugin_metadataedit.la
+%{tde_tdelibdir}/kipiplugin_metadataedit.so
+%{tde_tdelibdir}/kipiplugin_mpegencoder.la
+%{tde_tdelibdir}/kipiplugin_mpegencoder.so
+%{tde_tdelibdir}/kipiplugin_picasawebexport.la
+%{tde_tdelibdir}/kipiplugin_picasawebexport.so
+%{tde_tdelibdir}/kipiplugin_printwizard.la
+%{tde_tdelibdir}/kipiplugin_printwizard.so
+%{tde_tdelibdir}/kipiplugin_rawconverter.la
+%{tde_tdelibdir}/kipiplugin_rawconverter.so
+%{tde_tdelibdir}/kipiplugin_sendimages.la
+%{tde_tdelibdir}/kipiplugin_sendimages.so
+%{tde_tdelibdir}/kipiplugin_simpleviewer.la
+%{tde_tdelibdir}/kipiplugin_simpleviewer.so
+%{tde_tdelibdir}/kipiplugin_slideshow.la
+%{tde_tdelibdir}/kipiplugin_slideshow.so
+%{tde_tdelibdir}/kipiplugin_timeadjust.la
+%{tde_tdelibdir}/kipiplugin_timeadjust.so
+%{tde_tdelibdir}/kipiplugin_viewer.la
+%{tde_tdelibdir}/kipiplugin_viewer.so
+%{tde_tdelibdir}/kipiplugin_wallpaper.la
+%{tde_tdelibdir}/kipiplugin_wallpaper.so
+%{tde_datadir}/applnk/.hidden/kipi-plugins.desktop
+%{tde_datadir}/apps/kipi/
+%{tde_datadir}/apps/kipiplugin_batchprocessimages/
+%{tde_datadir}/apps/kipiplugin_findimages/
+%{tde_datadir}/apps/kipiplugin_galleryexport/
+%{tde_datadir}/apps/kipiplugin_gpssync/
+%{tde_datadir}/apps/kipiplugin_htmlexport/
+%{tde_datadir}/apps/kipiplugin_jpeglossless/
+%{tde_datadir}/apps/kipiplugin_rawconverter/
+%{tde_datadir}/apps/kipiplugin_simpleviewerexport/
+%{tde_datadir}/apps/kipiplugin_slideshow/
+%{tde_datadir}/apps/kipiplugin_viewer/
+%{tde_datadir}/config.kcfg/htmlexportconfig.kcfg
+%{tde_datadir}/services/kipiplugin_acquireimages.desktop
+%{tde_datadir}/services/kipiplugin_batchprocessimages.desktop
+%{tde_datadir}/services/kipiplugin_calendar.desktop
+%{tde_datadir}/services/kipiplugin_cdarchiving.desktop
+%{tde_datadir}/services/kipiplugin_findimages.desktop
+%{tde_datadir}/services/kipiplugin_flickrexport.desktop
+%{tde_datadir}/services/kipiplugin_galleryexport.desktop
+%{tde_datadir}/services/kipiplugin_gpssync.desktop
+%{tde_datadir}/services/kipiplugin_htmlexport.desktop
+%if 0%{?with_gpod}
+%{tde_datadir}/services/kipiplugin_ipodexport.desktop
+%endif
+%{tde_datadir}/services/kipiplugin_jpeglossless.desktop
+%{tde_datadir}/services/kipiplugin_kameraklient.desktop
+%{tde_datadir}/services/kipiplugin_metadataedit.desktop
+%{tde_datadir}/services/kipiplugin_mpegencoder.desktop
+%{tde_datadir}/services/kipiplugin_picasawebexport.desktop
+%{tde_datadir}/services/kipiplugin_printwizard.desktop
+%{tde_datadir}/services/kipiplugin_rawconverter.desktop
+%{tde_datadir}/services/kipiplugin_sendimages.desktop
+%{tde_datadir}/services/kipiplugin_simpleviewer.desktop
+%{tde_datadir}/services/kipiplugin_slideshow.desktop
+%{tde_datadir}/services/kipiplugin_timeadjust.desktop
+%{tde_datadir}/services/kipiplugin_viewer.desktop
+%{tde_datadir}/services/kipiplugin_wallpaper.desktop
+%{tde_mandir}/man1/images2mpg.1*
+%{tde_tdedocdir}/HTML/de/kipi-plugins/
+%{tde_tdedocdir}/HTML/en/kipi-plugins/
+%{tde_tdedocdir}/HTML/es/kipi-plugins/
+%{tde_tdedocdir}/HTML/et/kipi-plugins/
+%{tde_tdedocdir}/HTML/it/kipi-plugins/
+%{tde_tdedocdir}/HTML/nl/kipi-plugins/
+%{tde_tdedocdir}/HTML/pt_BR/kipi-plugins/
+%{tde_tdedocdir}/HTML/ru/kipi-plugins/
+%{tde_tdedocdir}/HTML/sv/kipi-plugins/
+%lang(ar) %{tde_datadir}/locale/ar/LC_MESSAGES/*.mo
+%lang(be) %{tde_datadir}/locale/be/LC_MESSAGES/*.mo
+%lang(br) %{tde_datadir}/locale/br/LC_MESSAGES/*.mo
+%lang(ca) %{tde_datadir}/locale/ca/LC_MESSAGES/*.mo
+%lang(cs) %{tde_datadir}/locale/cs/LC_MESSAGES/*.mo
+%lang(cy) %{tde_datadir}/locale/cy/LC_MESSAGES/*.mo
+%lang(da) %{tde_datadir}/locale/da/LC_MESSAGES/*.mo
+%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo
+%lang(el) %{tde_datadir}/locale/el/LC_MESSAGES/*.mo
+%lang(en_GB) %{tde_datadir}/locale/en_GB/LC_MESSAGES/*.mo
+%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/*.mo
+%lang(et) %{tde_datadir}/locale/et/LC_MESSAGES/*.mo
+%lang(fi) %{tde_datadir}/locale/fi/LC_MESSAGES/*.mo
+%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/*.mo
+%lang(ga) %{tde_datadir}/locale/ga/LC_MESSAGES/*.mo
+%lang(gl) %{tde_datadir}/locale/gl/LC_MESSAGES/*.mo
+%lang(hu) %{tde_datadir}/locale/hu/LC_MESSAGES/*.mo
+%lang(is) %{tde_datadir}/locale/is/LC_MESSAGES/*.mo
+%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/*.mo
+%lang(ja) %{tde_datadir}/locale/ja/LC_MESSAGES/*.mo
+%lang(lt) %{tde_datadir}/locale/lt/LC_MESSAGES/*.mo
+%lang(ms) %{tde_datadir}/locale/ms/LC_MESSAGES/*.mo
+%lang(mt) %{tde_datadir}/locale/mt/LC_MESSAGES/*.mo
+%lang(nb) %{tde_datadir}/locale/nb/LC_MESSAGES/*.mo
+%lang(nds) %{tde_datadir}/locale/nds/LC_MESSAGES/*.mo
+%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo
+%lang(nn) %{tde_datadir}/locale/nn/LC_MESSAGES/*.mo
+%lang(pa) %{tde_datadir}/locale/pa/LC_MESSAGES/*.mo
+%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/*.mo
+%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo
+%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo
+%lang(rw) %{tde_datadir}/locale/rw/LC_MESSAGES/*.mo
+%lang(sk) %{tde_datadir}/locale/sk/LC_MESSAGES/*.mo
+%lang(sr) %{tde_datadir}/locale/sr/LC_MESSAGES/*.mo
+%lang(sr@Latn) %{tde_datadir}/locale/sr@Latn/LC_MESSAGES/*.mo
+%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/*.mo
+%lang(ta) %{tde_datadir}/locale/ta/LC_MESSAGES/*.mo
+%lang(th) %{tde_datadir}/locale/th/LC_MESSAGES/*.mo
+%lang(tr) %{tde_datadir}/locale/tr/LC_MESSAGES/*.mo
+%lang(uk) %{tde_datadir}/locale/uk/LC_MESSAGES/*.mo
+%lang(zh_CN) %{tde_datadir}/locale/zh_CN/LC_MESSAGES/*.mo
+
+
+%changelog
diff --git a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec b/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec
index 8b792af4a..d3ad7ed60 100644
--- a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec
+++ b/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package libkdcraw (version R14.0.0)
+# spec file for package libkdcraw (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -12,12 +12,14 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # TDE variables
 %define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 %define tde_pkg libkdcraw
 %define tde_prefix /opt/trinity
 %define tde_datadir %{tde_prefix}/share
@@ -35,7 +37,7 @@
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	0.1.9
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	Raw picture decoding C++ library (runtime) [Trinity]
 Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
@@ -64,7 +66,7 @@ BuildRequires: pkgconfig
 BuildRequires: gettext
 
 # LCMS support
-%if 0%{?suse_version}
+%if 0%{?suse_version} || 0%{?rhel} >= 7
 BuildRequires: liblcms-devel
 %else
 BuildRequires: lcms-devel
@@ -108,12 +110,6 @@ libkdcraw contains the library of libkdcraw.
 %{tde_libdir}/libkdcraw.so.4
 %{tde_libdir}/libkdcraw.so.4.0.3
 
-%post -n trinity-%{libkdcraw}4
-/sbin/ldconfig || :
-
-%postun -n trinity-%{libkdcraw}4
-/sbin/ldconfig || :
-
 ##########
 
 %package -n trinity-libkdcraw-common
@@ -131,18 +127,6 @@ libkdcraw contains the library of libkdcraw.
 %defattr(-,root,root,-)
 %{tde_datadir}/icons/hicolor/*/apps/kdcraw.png
 
-%post -n trinity-libkdcraw-common
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-%postun -n trinity-libkdcraw-common
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
 ##########
 
 %package -n trinity-%{libkdcraw}-devel
@@ -166,12 +150,6 @@ library documentation is available on kdcraw.h header file.
 %{tde_tdeincludedir}/libkdcraw/
 %{tde_libdir}/pkgconfig/libkdcraw.pc
 
-%post -n trinity-%{libkdcraw}-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-%{libkdcraw}-devel
-/sbin/ldconfig || :
-
 ##########
 
 %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -184,7 +162,7 @@ library documentation is available on kdcraw.h header file.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -228,6 +206,4 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 
 
-%Changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.1.9-1
-- Initial release for TDE R14.0.0
+%changelog
diff --git a/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec b/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec
index 56c706a00..93e82bd9b 100644
--- a/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec
+++ b/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec
@@ -2,11 +2,6 @@
 %define tde_pkg libkdcraw
 %define tde_version 3.5.13.2
 
-# 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_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -28,7 +23,7 @@ Summary:	Raw picture decoding C++ library (runtime) [Trinity]
 
 Epoch:		1
 Version:	0.1.9
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 
 License:	GPLv2+
 Group:		Environment/Libraries
@@ -91,7 +86,7 @@ library documentation is available on kdcraw.h header file.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -167,9 +162,4 @@ done
 %{tde_tdeincludedir}/libkdcraw/
 %{tde_libdir}/pkgconfig/libkdcraw.pc
 
-%Changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:0.1.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
+%changelog
diff --git a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec b/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec
index d10f2ba1d..26a35fb11 100644
--- a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec
+++ b/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package libkexiv2 (version R14.0.0)
+# spec file for package libkexiv2 (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # BUILD WARNING:
@@ -21,7 +21,9 @@
 
 # TDE variables
 %define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 %define tde_pkg libkexiv2
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
@@ -34,11 +36,6 @@
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-# 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
-
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
 %define libkexiv %{_lib}kexiv
 %else
@@ -47,11 +44,11 @@
 
 
 Name:		trinity-%{tde_pkg}
-Summary:	Qt like interface for the libexiv2 library (runtime) [Trinity]
-Group:		System/Libraries
 Epoch:		2
 Version:	0.1.7
-Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Qt like interface for the libexiv2 library (runtime) [Trinity]
+Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
 
 %if 0%{?suse_version}
@@ -115,12 +112,6 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
 %{tde_libdir}/libkexiv2.so.5
 %{tde_libdir}/libkexiv2.so.5.0.0
 
-%post -n trinity-%{libkexiv}2-5
-/sbin/ldconfig || :
-
-%postun -n trinity-%{libkexiv}2-5
-/sbin/ldconfig || :
-
 ##########
 
 %package -n trinity-%{libkexiv}2-devel
@@ -143,12 +134,6 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
 %{tde_tdeincludedir}/libkexiv2/
 %{tde_libdir}/pkgconfig/libkexiv2.pc
 
-%post -n trinity-%{libkexiv}2-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-%{libkexiv}2-devel
-/sbin/ldconfig || :
-
 ##########
 
 %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -161,7 +146,7 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -201,7 +186,4 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 
 
-
-%Changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.7-2
-- Initial release for TDE 14.0.0
+%changelog
diff --git a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec b/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec
index 03e4966ac..38f08646a 100644
--- a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec
+++ b/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec
@@ -2,11 +2,6 @@
 %define tde_pkg libkexiv2
 %define tde_version 3.5.13.2
 
-# 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_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -28,7 +23,7 @@ Summary:	Qt like interface for the libexiv2 library (runtime) [Trinity]
 
 Epoch:		1
 Version:	0.1.7
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 
 License:	GPLv2+
 Group:		Environment/Libraries
@@ -92,7 +87,7 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -157,9 +152,4 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_libdir}/pkgconfig/libkexiv2.pc
 
 
-%Changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.7-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
+%changelog
diff --git a/redhat/libraries/libkipi/libkipi-14.0.0.spec b/redhat/libraries/libkipi/libkipi-14.0.0.spec
index d6a48a34f..010aafa52 100644
--- a/redhat/libraries/libkipi/libkipi-14.0.0.spec
+++ b/redhat/libraries/libkipi/libkipi-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package libkipi (version R14.0.0)
+# spec file for package libkipi (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # BUILD WARNING:
@@ -21,7 +21,9 @@
 
 # TDE variables
 %define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 %define tde_pkg libkipi
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
@@ -34,11 +36,6 @@
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-# 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
-
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
 %define libkipi %{_lib}kipi
 %else
@@ -47,11 +44,11 @@
 
 
 Name:		trinity-%{tde_pkg}
-Summary:	library for apps that want to use kipi-plugins (runtime version) [Trinity]
-Group:		System/Libraries
-Epoch:		2
+Epoch:		%{tde_epoch}
 Version:	0.1.5
-Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Library for apps that want to use kipi-plugins (runtime version) [Trinity]
+Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
 
 %if 0%{?suse_version}
@@ -76,7 +73,7 @@ BuildRequires: gettext
 BuildRequires: gcc-c++
 
 # LCMS support
-%if 0%{?suse_version}
+%if 0%{?suse_version} || 0%{?rhel} >= 7
 BuildRequires: liblcms-devel
 %else
 BuildRequires: lcms-devel
@@ -96,9 +93,9 @@ BuildRequires:	libtool-ltdl-devel
 
 %description
 Libkipi is a library
-  o that contains common routines and widget used by kipi-plugins
-  o to ease implementation of the kipi-plugins interface in an application
-    that wants to use kipi-plugins
+- that contains common routines and widget used by kipi-plugins
+- to ease implementation of the kipi-plugins interface in an application
+  that wants to use kipi-plugins
     
 Homepage: http://www.kipi-plugins.org/
 
@@ -119,20 +116,6 @@ Libkipi is a library
     
 Homepage: http://www.kipi-plugins.org/
 
-%post -n trinity-%{libkipi}0
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun -n trinity-%{libkipi}0
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
 %files -n trinity-%{libkipi}0 -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %{tde_libdir}/libkipi.so.0
@@ -167,12 +150,6 @@ Homepage: http://www.kipi-plugins.org/
 %{tde_tdeincludedir}/libkipi/
 %{tde_libdir}/pkgconfig/libkipi.pc
 
-%post -n trinity-%{libkipi}-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-%{libkipi}-devel
-/sbin/ldconfig || :
-
 ##########
 
 %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -185,7 +162,7 @@ Homepage: http://www.kipi-plugins.org/
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -226,6 +203,4 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 
-%Changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.5-2
-- Initial release for TDE 14.0.0
+%changelog
diff --git a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec b/redhat/libraries/libkipi/libkipi-3.5.13.2.spec
index 156064992..740aea3b1 100644
--- a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec
+++ b/redhat/libraries/libkipi/libkipi-3.5.13.2.spec
@@ -2,11 +2,6 @@
 %define tde_pkg libkipi
 %define tde_version 3.5.13.2
 
-# 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_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -27,7 +22,7 @@ Summary:	library for apps that want to use kipi-plugins (runtime version) [Trini
 
 Epoch:		1
 Version:	0.1.5
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 
 License:	GPLv2+
 Group:		Environment/Libraries
@@ -96,7 +91,7 @@ Homepage: http://www.kipi-plugins.org/
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -169,9 +164,4 @@ done
 %{tde_tdeincludedir}/libkipi/
 %{tde_libdir}/pkgconfig/libkipi.pc
 
-%Changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.5-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
+%changelog
diff --git a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
index 6d7bfb862..9254f1700 100644
--- a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
@@ -1,5 +1,9 @@
+%if 0%{?fedora} >= 23
+%define _hardened_ldflags %nil
+%endif
+
 #
-# spec file for package libksquirrel (version R14.0.0)
+# spec file for package libksquirrel (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -12,7 +16,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # BUILD WARNING:
@@ -21,7 +25,9 @@
 
 # TDE variables
 %define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 %define tde_pkg libksquirrel
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
@@ -34,18 +40,13 @@
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-# 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
-
 
 Name:		trinity-%{tde_pkg}
-Summary:	Trinity image viewer
-Group:		System/Libraries
 Epoch:		%{tde_epoch}
 Version:	0.8.0
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Trinity image viewer
+Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
 
 %if 0%{?suse_version}
@@ -61,6 +62,7 @@ Prefix:			%{tde_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:	%{name}-rpmlintrc
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
@@ -80,6 +82,10 @@ BuildRequires:	libtool-ltdl-devel
 # TRANSFIG support
 BuildRequires:	transfig
 
+# GHOSTSCRIPT support
+%define with_ghostscript 1
+BuildRequires:	ghostscript
+
 # GETTEXT support
 BuildRequires:	gettext
 BuildRequires:	gettext-devel
@@ -91,10 +97,9 @@ BuildRequires:	OpenEXR-devel
 BuildRequires:	libtiff-devel
 
 # GIF support
-%if 0%{?suse_version}
+%if 0%{?suse_version} || 0%{?fedora} >= 28
 BuildRequires:	giflib-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel}
+%else
 BuildRequires:	libungif-devel
 %endif
 
@@ -117,6 +122,9 @@ BuildRequires:	xmedcon-devel
 # RSVG support
 %if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define with_svg 1
+%if 0%{?rhel} == 5
+BuildRequires:	librsvg2-devel
+%endif
 %if 0%{?fedora} || 0%{?rhel} 
 BuildRequires:	librsvg2
 %endif
@@ -159,6 +167,9 @@ BuildRequires: freetype-devel
 # WMF support
 BuildRequires:	libwmf-devel
 
+# XML2 support
+BuildRequires:	libxml2-devel
+
 # NETPBM support
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 BuildRequires:	netpbm
@@ -192,8 +203,10 @@ This package contains the runtime libraries for KSquirrel.
 %{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0
 %{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0.8.0
 %endif
+%if 0%{?with_ghostscript}
 %{tde_libdir}/ksquirrel-libs/libkls_eps.so.0
 %{tde_libdir}/ksquirrel-libs/libkls_eps.so.0.8.0
+%endif
 %{tde_libdir}/ksquirrel-libs/libkls_fig.so.0
 %{tde_libdir}/ksquirrel-libs/libkls_fig.so.0.8.0
 %{tde_libdir}/ksquirrel-libs/libkls_fli.so.0
@@ -308,12 +321,6 @@ This package contains the runtime libraries for KSquirrel.
 %{tde_datadir}/ksquirrel-libs/libkls_xcf.so.ui
 %{tde_datadir}/ksquirrel-libs/rgbmap
 
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
 ##########
 
 %package devel
@@ -352,8 +359,10 @@ This package contains the development libraries for KSquirrel.
 %{tde_libdir}/ksquirrel-libs/libkls_djvu.la
 %{tde_libdir}/ksquirrel-libs/libkls_djvu.so
 %endif
+%if 0%{?with_ghostscript}
 %{tde_libdir}/ksquirrel-libs/libkls_eps.la
 %{tde_libdir}/ksquirrel-libs/libkls_eps.so
+%endif
 %{tde_libdir}/ksquirrel-libs/libkls_fig.la
 %{tde_libdir}/ksquirrel-libs/libkls_fig.so
 %{tde_libdir}/ksquirrel-libs/libkls_fli.la
@@ -459,12 +468,6 @@ This package contains the development libraries for KSquirrel.
 %{tde_libdir}/pkgconfig/ksquirrellibs.pc
 %{tde_docdir}/ksquirrel-libs/
 
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
 ##########
 
 %package tools
@@ -519,7 +522,7 @@ if [ -r /usr/include/freetype2/ftbitmap.h ]; then
 fi
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -558,6 +561,4 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 
 
-%Changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.8.0-1
-- Initial release for TDE 14.0.0
+%changelog
diff --git a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
index e1d177c2d..9945da33c 100644
--- a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
@@ -2,11 +2,6 @@
 %define tde_pkg libksquirrel
 %define tde_version 3.5.13.2
 
-# 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_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -27,7 +22,7 @@ Name:		trinity-%{tde_pkg}
 Summary:	Trinity image viewer
 Epoch:		1
 Version:	0.8.0
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 
 License:	GPLv2+
 Group:		Environment/Libraries
@@ -165,7 +160,7 @@ if [ -r /usr/include/freetype2/ftbitmap.h ]; then
 fi
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -516,9 +511,4 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_bindir}/ksquirrel-libs-xim2ppm
 
 
-%Changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.0-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
+%changelog
diff --git a/redhat/libraries/libksquirrel/trinity-libksquirrel-rpmlintrc b/redhat/libraries/libksquirrel/trinity-libksquirrel-rpmlintrc
new file mode 100644
index 000000000..529351884
--- /dev/null
+++ b/redhat/libraries/libksquirrel/trinity-libksquirrel-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('library-without-ldconfig-postun', 0)
+setBadness('library-without-ldconfig-postin', 0)
diff --git a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec b/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec
index 0ea245548..c13dbe2ae 100644
--- a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec
+++ b/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package libtdeldap (version R14.0.0)
+# spec file for package libtdeldap (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # BUILD WARNING:
@@ -21,7 +21,9 @@
 
 # TDE variables
 %define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 %define tde_pkg libtdeldap
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
@@ -34,18 +36,13 @@
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-# 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
-
 
 Name:		trinity-%{tde_pkg}
-Summary:	LDAP interface library for TDE
-Group:		System/Libraries
 Epoch:		%{tde_epoch}
 Version:	0.5
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	LDAP interface library for TDE
+Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
 
 %if 0%{?suse_version}
@@ -86,22 +83,41 @@ BuildRequires:	cyrus-sasl-devel
 %endif
 
 # OPENLDAP support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
 BuildRequires:	openldap-devel
 %endif
 %if 0%{?suse_version}
 BuildRequires:	openldap2-devel
 %endif
+%if 0%{?rhel} == 5
+BuildRequires:	openldap24-libs-devel
+%endif
 
+# HEIMDAL support
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	heimdal-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	libheimdal-devel
+%endif
 
-%description
-LDAP interface library for TDE management modules.
+# UDEV support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%define with_tdehwlib 1
+BuildRequires:	libudev-devel
+%endif
+
+# LIBCOM_ERR support
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
+BuildRequires:	libcom_err-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}ext2fs-devel
+%endif
 
-%post
-/sbin/ldconfig || :
 
-%postun
-/sbin/ldconfig || :
+%description
+LDAP interface library for TDE management modules.
 
 %files
 %defattr(-,root,root,-)
@@ -120,12 +136,6 @@ LDAP interface library for TDE management modules.
 
 libtdeldap-trinity-dev contains development files and documentation.
 
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
 %files devel
 %defattr(-,root,root,-)
 %{tde_tdeincludedir}/ldappasswddlg.h
@@ -145,7 +155,7 @@ libtdeldap-trinity-dev contains development files and documentation.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -153,6 +163,19 @@ libtdeldap-trinity-dev contains development files and documentation.
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
+extra_includes="%{_includedir}"
+extra_libs="%{_libdir}"
+
+if [ -d "%{_includedir}/openldap24" ]; then
+  extra_includes="%{_includedir}/openldap24:${extra_includes}"
+  extra_libs="%{_libdir}/openldap24:${extra_libs}"
+fi
+
+if [ -d "%{_includedir}/heimdal" ]; then
+  extra_includes="%{_includedir}/heimdal:${extra_includes}"
+  extra_libs="%{_libdir}/heimdal:${extra_libs}"
+fi
+
 %configure \
   --prefix=%{tde_prefix} \
   --exec-prefix=%{tde_prefix} \
@@ -167,7 +190,10 @@ export PATH="%{tde_bindir}:${PATH}"
   --enable-final \
   --enable-closure \
   --enable-rpath \
-  --disable-gcc-hidden-visibility
+  --disable-gcc-hidden-visibility \
+  \
+  --with-extra-includes=${extra_includes} \
+  --with-extra-libs=${extra_libs} \
 
 %__make %{?_smp_mflags}
 
@@ -182,6 +208,4 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 
 
-%Changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 20.5-1
-- Initial release for TDE 14.0.0
+%changelog
diff --git a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec b/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec
index 4d9b213a0..ab21298c0 100644
--- a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec
+++ b/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec
@@ -1,77 +1,103 @@
-# Default version for this component
-%define tde_pkg libtqt-perl
+#
+# spec file for package libtqt-perl (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
-
-# 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_pkg libtqt-perl
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadsir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
-%define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
 
 
 Name:		trinity-%{tde_pkg}
-Summary:	Perl bindings for the TQt library
+Epoch:		%{tde_epoch}
 Version:	3.008
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Perl bindings for the TQt library
+Group:		Development/Libraries/Perl
+URL:		http://www.trinitydesktop.org/
 
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
 License:	GPLv2+
-Group:		Environment/Libraries
+%endif
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+
+BuildRequires:	automake autoconf libtool
+BuildRequires:	gcc-c++
 BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:	pkgconfig
 
 BuildRequires:	trinity-libsmoketqt-devel >= %{tde_version}
 
-Provides:		perl(TQtShell)
-Provides:		perl(TQtShellControl)
+BuildRequires:	perl(ExtUtils::MakeMaker)
+
+Requires:		perl-TQt = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
 This module lets you use the TQt library from Perl.
 It provides an object-oriented interface and is easy to use.
 
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
 %files
 %defattr(-,root,root,-)
 %{tde_bindir}/puic
 %{tde_mandir}/man1/puic.1*
 %{_bindir}/pqtapi
 %{_bindir}/pqtsh
+%if 0%{?rhel} == 5
+%{_datadir}/doc/libqt-perl/
+%endif
+
+##########
+
+%package -n perl-TQt
+Summary:	Perl bindings for the TQt library
+Group:		Development/Libraries/Perl
+
+Provides:		perl(TQtShell)
+Provides:		perl(TQtShellControl)
+
+%description -n perl-TQt
+This module lets you use the TQt library from Perl.
+It provides an object-oriented interface and is easy to use.
+
+%files -n perl-TQt
+%defattr(-,root,root,-)
 %{perl_vendorarch}/TQt.pm
 %{perl_vendorarch}/TQt.pod
+%dir %{perl_vendorarch}/TQt
 %{perl_vendorarch}/TQt/GlobalSpace.pm
 %{perl_vendorarch}/TQt/attributes.pm
 %{perl_vendorarch}/TQt/constants.pm
@@ -86,7 +112,7 @@ It provides an object-oriented interface and is easy to use.
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -96,14 +122,14 @@ It provides an object-oriented interface and is easy to use.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
 %build
 unset QTDIR QTINC QTLIB
+export TDEDIR=%{tde_prefix}
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
   --prefix=%{tde_prefix} \
@@ -120,7 +146,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
   --enable-final \
   --enable-closure \
   --enable-rpath \
-  --disable-gcc-hidden-visibility
+  --disable-gcc-hidden-visibility \
+  \
+  --disable-smoke
+
+# Fix invalid path in RHEL 5
+%if 0%{?rhel} == 5
+%__sed -i "PerlTQt/Makefile" -e "s|\$(PREFIX)/|\$(DESTDIR)\$(PREFIX)/|"
+%endif
 
 %__make %{?_smp_mflags}
 
@@ -130,13 +163,13 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
+# Unwanted files
 %__rm -f %{buildroot}%{perl_archlib}/perllocal.pod
+%__rm -f %{buildroot}%{perl_vendorarch}/auto/TQt/.packlist
 
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%Changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.008-1
-- Initial release for TDE 14.0.0
+%changelog
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec
index 581d142cd..88888da02 100644
--- a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec
+++ b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec
@@ -1,51 +1,68 @@
+#
+# spec file for package pytdeextensions (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
-
-# 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_pkg pytdeextensions
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
 
-
-Name:		trinity-pytdeextensions
-Summary:	Python packages to support TDE applications (scripts) [Trinity]
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
 Version:	0.4.0
-Release:	%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
-
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Python packages to support TDE applications (scripts)
+Group:		Development/Libraries/Python
+URL:		http://www.trinitydesktop.org/
+#URL:		http://www.simonzone.com/software/pykdeextensions
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
 License:	GPLv2+
-Group:		Applications/Utilities
+%endif
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.simonzone.com/software/pykdeextensions
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
 
 BuildRequires:	python-tqt-devel >= %{?epoch:%{epoch}:}3.18.1
 BuildRequires:	trinity-python-trinity-devel
@@ -53,15 +70,15 @@ BuildRequires:	trinity-pytqt-tools
 Requires:		python-tqt
 Requires:		trinity-python-trinity
 
-Requires:		trinity-libpythonize0 = %{version}-%{release}
+Requires:		trinity-libpythonize0 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # SIP
 BuildRequires:	sip4-tqt-devel >= 4.10.5
 Requires:		sip4-tqt >= 4.10.5
 
 
-Obsoletes:		trinity-pykdeextensions < %{version}-%{release}
-Provides:		trinity-pykdeextensions = %{version}-%{release}
+Obsoletes:		trinity-pykdeextensions < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-pykdeextensions = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -79,45 +96,36 @@ to support the creation and installation of TDE applications.
 ##########
 
 %package -n trinity-libpythonize0
-Summary:		Python packages to support KDE applications (library) [Trinity]	
-Group:			Environment/Libraries
+Summary:	Python packages to support TDE applications (library)
+Group:		Development/Libraries/Python
 
 %description -n trinity-libpythonize0
 PyTDE Extensions is a collection of software and Python packages
-to support the creation and installation of KDE applications.
+to support the creation and installation of TDE applications.
 
 This package contains the libpythonize library files.
 
-%post -n trinity-libpythonize0
-/sbin/ldconfig
-
-%postun -n trinity-libpythonize0
-/sbin/ldconfig
-
 %files -n trinity-libpythonize0
 %defattr(-,root,root,-)
 %{tde_libdir}/libpythonize.so.*
 
 ##########
 
-%package -n trinity-libpythonize0-devel
-Summary:		Python packages to support KDE applications (development) [Trinity]
-Group:			Development/Libraries
-Requires:		trinity-libpythonize0 = %{version}-%{release}
+%package -n trinity-libpythonize-devel
+Summary:	Python packages to support TDE applications (development)
+Group:		Development/Libraries/Python
+Requires:	trinity-libpythonize0 = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	trinity-libpythonize0-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-libpythonize0-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n trinity-libpythonize0-devel
+%description -n trinity-libpythonize-devel
 PyTDE Extensions is a collection of software and Python packages
 to support the creation and installation of TDE applications.
 
 This package contains the libpythonize development files.
 
-%post -n trinity-libpythonize0-devel
-/sbin/ldconfig
-
-%postun -n trinity-libpythonize0-devel
-/sbin/ldconfig
-
-%files -n trinity-libpythonize0-devel
+%files -n trinity-libpythonize-devel
 %defattr(-,root,root,-)
 %{tde_tdeincludedir}/*.h
 %{tde_libdir}/libpythonize.la
@@ -126,19 +134,20 @@ This package contains the libpythonize development files.
 ##########
 
 %package devel
-Summary:		Meta-package to install all pytdeextensions development files
-Group:			Development/Libraries
-Requires:		%{name}-devel = %{version}-%{release}
-Requires:		trinity-libpythonize0-devel = %{version}-%{release}
+Summary:	Meta-package to install all pytdeextensions development files
+Group:		Development/Libraries/Python
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libpythonize-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
-%{summary}
+This package is a meta-package to install all pytdeextensions development
+files.
 
 %files devel
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -171,6 +180,11 @@ if [ -f "%{_libdir}/${LIBPYTHON}" ]; then
     -e "s|#define LIB_PYTHON \".*\"|#define LIB_PYTHON \"%{_libdir}/${LIBPYTHON}\"|"
 fi
 
+# Fix FTBFS on RHEL 5
+%if 0%{?rhel} == 5
+%__sed -i "src/pythonize."* -e "s|const char \*object|char \*object|g"
+%endif
+
 
 %build
 unset QTDIR QTINC QTLIB
@@ -223,5 +237,3 @@ done
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0-6
-- Initial build for TDE 14.0.0
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec b/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec
index a9b5fffd9..069af8cec 100644
--- a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec
+++ b/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec
@@ -2,11 +2,6 @@
 
 %define tde_version 3.5.13.2
 
-# 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_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -27,7 +22,7 @@
 Name:		trinity-pytdeextensions
 Summary:	Python packages to support TDE applications (scripts) [Trinity]
 Version:	0.4.0
-Release:	%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -228,11 +223,3 @@ done
 
 
 %changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0-5
-- Build for Fedora 19
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0-4
-- Initial release for TDE 3.5.13.2
-
-* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-3
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec b/redhat/libraries/python-trinity/python-trinity-14.0.0.spec
index 4b19fb540..f969038f9 100644
--- a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec
+++ b/redhat/libraries/python-trinity/python-trinity-14.0.0.spec
@@ -1,53 +1,68 @@
+#
+# spec file for package python-trinity (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-# 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 variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
-
-# TDE specific building variables
+%endif
+%define tde_pkg python-trinity
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
 
-%define __arch_install_post %{nil}
 
-
-Name:		trinity-python-trinity
-Summary:	Trinity bindings for Python [Trinity]
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
 Version:	3.16.3
-Release:	%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Trinity bindings for Python
+Group:		Development/Libraries/Python
+URL:		http://www.trinitydesktop.org/
+#URL:		http://www.simonzone.com/software/pykdeextensions
 
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
 License:	GPLv2+
-Group:		Applications/Utilities
+%endif
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-#URL:		http://www.simonzone.com/software/pykdeextensions
-URL:		http://www.trinitydesktop.org/
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Prefix:		%{_prefix}
+Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
 
 # PYTHON support
 BuildRequires:	python
@@ -58,19 +73,27 @@ Requires:		python-tqt
 BuildRequires:	sip4-tqt-devel >= 4.10.5
 Requires:		sip4-tqt >= 4.10.5
 
-Obsoletes:	python-trinity < %{version}-%{release}
-Provides:	python-trinity = %{version}-%{release}
+Obsoletes:	python-trinity < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	python-trinity = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 Python binding module that provides wide access to the Trinity API,
 also known as PyTDE. Using this, you'll get (for example) classes
 from tdeio, tdejs, tdehtml and tdeprint.
 
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%{python_sitearch}/*.so
+%{python_sitearch}/dcop*.py*
+%{python_sitearch}/pytde*.py*
+
+##########
 
 %package devel
-Summary:		Trinity bindings for Python - Development files and scripts [Trinity]
-Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
+Summary:	Trinity bindings for Python - Development files and scripts
+Group:		Development/Libraries/Python
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Obsoletes:	python-trinity-devel < %{version}-%{release}
 Provides:	python-trinity-devel = %{version}-%{release}
@@ -82,23 +105,36 @@ packages based on them.
 The package also contains kdepyuic, a wrapper script around PyQt's 
 user interface compiler.
 
+%files devel
+%defattr(-,root,root,-)
+%{tde_bindir}/tdepyuic
+# The SIP files are outside TDE's prefix
+%{_datadir}/sip/trinity/
+
+##########
 
 %package doc
-Summary:		Documentation and examples for PyTDE [Trinity]
-Group:			Development/Libraries
+Summary:	Documentation and examples for PyTDE
+Group:		Development/Libraries/Python
 
-Obsoletes:	python-trinity-doc < %{version}-%{release}
-Provides:	python-trinity-doc = %{version}-%{release}
+Obsoletes:	python-trinity-doc < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	python-trinity-doc = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description doc
 General documentation and examples for PyTDE providing programming
 tips and working code you can use to learn from.
 
+%files doc
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/en/python-trinity/
+
+##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -133,24 +169,4 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 
 
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{python_sitearch}/*.so
-%{python_sitearch}/dcop*.py*
-%{python_sitearch}/pytde*.py*
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/tdepyuic
-# The SIP files are outside TDE's prefix
-%{_datadir}/sip/trinity/
-
-%files doc
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/en/python-trinity/
-
-
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.16.3-5
-- Initial release for TDE 14.0.0
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec b/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec
index ee6f31361..279346a1f 100644
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec
+++ b/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec
@@ -1,9 +1,5 @@
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-# 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
 
 # TDE specific building variables
@@ -28,7 +24,7 @@
 Name:		trinity-python-trinity
 Summary:	Trinity bindings for Python [Trinity]
 Version:	3.16.3
-Release:	%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -188,11 +184,3 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.6.13-5
-- Build for Fedora 19
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.16.3-4
-- Initial release for TDE 3.5.13.2
-
-* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.16.3-3
-- Initial release for TDE 3.5.13.1