RPM packaging: update libraries

3 files changed, 117 insertions, 383 deletions

diff --git a/redhat/libraries/libkipi/libkipi-14.0.0.spec b/redhat/libraries/libkipi/libkipi-14.0.0.spec
index 0813ffe89..d6a48a34f 100644
--- a/redhat/libraries/libkipi/libkipi-14.0.0.spec
+++ b/redhat/libraries/libkipi/libkipi-14.0.0.spec
@@ -1,58 +1,89 @@
-# Default version for this component
-%define tde_pkg libkipi
+#
+# spec file for package libkipi (version R14.0.0)
+#
+# 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
 %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 libkipi
+%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
 
-%define _docdir %{tde_docdir}
+# 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
+%define libkipi libkipi
+%endif
 
 
 Name:		trinity-%{tde_pkg}
 Summary:	library for apps that want to use kipi-plugins (runtime version) [Trinity]
-
-Epoch:		1
+Group:		System/Libraries
+Epoch:		2
 Version:	0.1.5
 Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+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:		%{_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: pkgconfig
+BuildRequires: gettext
+BuildRequires: gcc-c++
+
+# LCMS support
 %if 0%{?suse_version}
 BuildRequires: liblcms-devel
 %else
 BuildRequires: lcms-devel
 %endif
+
+# JPEG support
 BuildRequires: libjpeg-devel
-BuildRequires: pkgconfig
-BuildRequires: gettext
 
 # AUTOTOOLS
 BuildRequires: automake autoconf libtool
@@ -71,13 +102,56 @@ Libkipi is a library
     
 Homepage: http://www.kipi-plugins.org/
 
+##########
+
+%package -n trinity-%{libkipi}0
+Summary:	library for apps that want to use kipi-plugins (runtime version) [Trinity]
+Group:		System/Libraries
+
+Obsoletes:	trinity-%{tde_pkg} < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-%{tde_pkg} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-%{libkipi}0
+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
+    
+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 || :
 
-%package devel
-Group:		Development/Libraries
+%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
+%{tde_libdir}/libkipi.so.0.1.1
+%{tde_datadir}/apps/kipi/
+%{tde_datadir}/icons/hicolor/*/apps/kipi.png
+%{tde_datadir}/servicetypes/kipiplugin.desktop
+
+##########
+
+%package -n trinity-%{libkipi}-devel
+Group:		Development/Libraries/Other
 Summary:	library for apps that want to use kipi-plugins (development version) [Trinity]
 Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description devel
+Obsoletes:	trinity-%{tde_pkg}-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-%{tde_pkg}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-%{libkipi}-devel
 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
@@ -86,11 +160,26 @@ Libkipi is a library
 This package contains development files and documentation for libkipi library.
 Homepage: http://www.kipi-plugins.org/
 
+%files -n trinity-%{libkipi}-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libkipi.so
+%{tde_libdir}/libkipi.la
+%{tde_tdeincludedir}/libkipi/
+%{tde_libdir}/pkgconfig/libkipi.pc
+
+%post -n trinity-%{libkipi}-devel
+/sbin/ldconfig || :
+
+%postun -n trinity-%{libkipi}-devel
+/sbin/ldconfig || :
+
+##########
 
-%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}}
@@ -134,41 +223,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 
 
-%post
-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
-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 || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
 
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_libdir}/libkipi.so.0
-%{tde_libdir}/libkipi.so.0.1.1
-%{tde_datadir}/apps/kipi/
-%{tde_datadir}/icons/hicolor/*/apps/kipi.png
-%{tde_datadir}/servicetypes/kipiplugin.desktop
 
-%files devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkipi.so
-%{tde_libdir}/libkipi.la
-%{tde_tdeincludedir}/libkipi/
-%{tde_libdir}/pkgconfig/libkipi.pc
 
 %Changelog
 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.5-2
diff --git a/redhat/libraries/libkipi/libkipi-3.5.13.1.spec b/redhat/libraries/libkipi/libkipi-3.5.13.1.spec
deleted file mode 100644
index 6831bd301..000000000
--- a/redhat/libraries/libkipi/libkipi-3.5.13.1.spec
+++ /dev/null
@@ -1,172 +0,0 @@
-# Default version for this component
-%define kdecomp libkipi
-
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%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/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-%{kdecomp}
-Summary:	library for apps that want to use kipi-plugins (runtime version) [Trinity]
-
-Version:	3.5.13.1
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Environment/Libraries
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{version}
-BuildRequires: trinity-arts-devel >= %{version}
-BuildRequires: trinity-tdelibs-devel >= %{version}
-BuildRequires: desktop-file-utils
-%if 0%{?suse_version}
-BuildRequires: liblcms-devel
-%else
-BuildRequires: lcms-devel
-%endif
-BuildRequires: libjpeg-devel
-BuildRequires: pkgconfig
-BuildRequires: automake autoconf libtool 
-BuildRequires: gettext
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}ltdl-devel
-%else
-BuildRequires:	libtool-ltdl-devel
-%endif
-
-%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
-    
-Homepage: http://www.kipi-plugins.org/
-
-
-%package devel
-Group:		Development/Libraries
-Summary:	library for apps that want to use kipi-plugins (development version) [Trinity]
-Requires:	%{name} = %{version}
-
-%description devel
-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
-    
-This package contains development files and documentation for libkipi library.
-Homepage: http://www.kipi-plugins.org/
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__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"
-%__make -f "admin/Makefile.common"
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-    --prefix=%{tde_prefix} \
-    --exec-prefix=%{tde_prefix} \
-	--datadir=%{tde_datadir} \
-	--libdir=%{tde_libdir} \
-	--includedir=%{tde_tdeincludedir} \
-	--disable-rpath \
-    --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-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
-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 || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_libdir}/libkipi.so.0
-%{tde_libdir}/libkipi.so.0.1.1
-%{tde_datadir}/apps/kipi/
-%{tde_datadir}/icons/hicolor/*/apps/kipi.png
-%{tde_datadir}/servicetypes/kipiplugin.desktop
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkipi.so
-%{tde_libdir}/libkipi.la
-%{tde_tdeincludedir}/libkipi/
-%{tde_libdir}/pkgconfig/libkipi.pc
-
-%Changelog
-* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/libraries/libkipi/libkipi-3.5.13.spec b/redhat/libraries/libkipi/libkipi-3.5.13.spec
deleted file mode 100644
index 49c202b2d..000000000
--- a/redhat/libraries/libkipi/libkipi-3.5.13.spec
+++ /dev/null
@@ -1,150 +0,0 @@
-# Default version for this component
-%define kdecomp libkipi
-
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%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/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	library for apps that want to use kipi-plugins (runtime version) [Trinity]
-
-Version:	3.5.13
-Release:	1%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Environment/Libraries
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: desktop-file-utils
-BuildRequires: lcms-devel, libjpeg-devel, pkgconfig
-BuildRequires: automake autoconf libtool 
-BuildRequires: gettext
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}ltdl-devel
-%else
-BuildRequires:	libtool-ltdl-devel
-%endif
-
-%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
-    
-Homepage: http://www.kipi-plugins.org/
-
-
-%package devel
-Group:		Development/Libraries
-Summary:	library for apps that want to use kipi-plugins (development version) [Trinity]
-Requires:	%{name} = %{version}
-
-%description devel
-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
-    
-This package contains development files and documentation for libkipi library.
-Homepage: http://www.kipi-plugins.org/
-
-%prep
-%setup -q -n libraries/%{kdecomp}
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__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"
-%__make -f "admin/Makefile.common"
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-	--datadir=%{tde_datadir} \
-	--libdir=%{tde_libdir} \
-	--includedir=%{tde_includedir} \
-	--disable-rpath \
-    --with-extra-includes=%{tde_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%{tde_libdir}/libkipi.so.0
-%{tde_libdir}/libkipi.so.0.1.1
-%{tde_datadir}/apps/kipi/
-%{tde_datadir}/icons/hicolor/*/apps/kipi.png
-%{tde_datadir}/servicetypes/kipiplugin.desktop
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkipi.so
-%{tde_libdir}/libkipi.la
-%{tde_includedir}/libkipi/
-%{tde_libdir}/pkgconfig/libkipi.pc
-
-%Changelog
-* Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15