RPM: merge redhat directory with master branch

2 files changed, 17 insertions, 52 deletions

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