RPM: merge redhat directory with master branch

4 files changed, 27 insertions, 67 deletions

diff --git a/redhat/applications/kerry/kerry-14.0.0.spec b/redhat/applications/kerry/kerry-14.0.0.spec
index 16e3c36f9..8cb5a96fb 100644
--- a/redhat/applications/kerry/kerry-14.0.0.spec
+++ b/redhat/applications/kerry/kerry-14.0.0.spec
@@ -1,10 +1,24 @@
+#
+# spec file for package kerry (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/
+#
+
 # Default version for this component
 %define tde_pkg kerry
+%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
@@ -27,7 +41,7 @@
 Name:			trinity-%{tde_pkg}
 Summary:		a TDE frontend for the Beagle desktop search daemon [Trinity]
 Version:		0.2.1
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 
 License:		GPLv2+
 Group:			Applications/Utilities
@@ -75,7 +89,7 @@ filesystems, chat logs, mail and data, RSS and other.
 %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"
 
 
@@ -119,19 +133,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 
 
-%post
-/sbin/ldconfig || :
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-/sbin/ldconfig || :
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %{tde_datadir}/locale/*/LC_MESSAGES/kcmbeagle.mo
@@ -153,14 +154,3 @@ update-desktop-database %{tde_appdir} &> /dev/null
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.2.1-4
-- Initial release for TDE 14.0.0
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.2.1-3
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.2.1-2
-- Initial release for TDE 3.5.13.1
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.2.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kerry/kerry-3.5.13.1.spec b/redhat/applications/kerry/kerry-3.5.13.1.spec
index 9bc265341..c1fbec722 100644
--- a/redhat/applications/kerry/kerry-3.5.13.1.spec
+++ b/redhat/applications/kerry/kerry-3.5.13.1.spec
@@ -1,11 +1,6 @@
 # Default version for this component
 %define kdecomp kerry
 
-# 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
@@ -26,7 +21,7 @@
 Name:		trinity-%{kdecomp}
 Summary:	a KDE frontend for the Beagle desktop search daemon [Trinity]
 Version:	0.2.1
-Release:	2%{?dist}%{?_variant}
+Release:	2%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -79,7 +74,7 @@ filesystems, chat logs, mail and data, RSS and other.
   -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__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"
 
 
@@ -151,8 +146,3 @@ update-desktop-database %{tde_appdir} &> /dev/null
 
 
 %changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.2.1-2
-- Initial release for TDE 3.5.13.1
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.2.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kerry/kerry-3.5.13.2.spec b/redhat/applications/kerry/kerry-3.5.13.2.spec
index 09949032e..eb48b72c8 100644
--- a/redhat/applications/kerry/kerry-3.5.13.2.spec
+++ b/redhat/applications/kerry/kerry-3.5.13.2.spec
@@ -1,11 +1,6 @@
 # Default version for this component
 %define tdecomp kerry
 
-# 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
@@ -26,7 +21,7 @@
 Name:		trinity-%{tdecomp}
 Summary:	a KDE frontend for the Beagle desktop search daemon [Trinity]
 Version:	0.2.1
-Release:	3%{?dist}%{?_variant}
+Release:	3%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -79,7 +74,7 @@ filesystems, chat logs, mail and data, RSS and other.
   -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__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"
 
 
@@ -151,11 +146,3 @@ update-desktop-database %{tde_appdir} &> /dev/null
 
 
 %changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.2.1-3
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.2.1-2
-- Initial release for TDE 3.5.13.1
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.2.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kerry/kerry-3.5.13.spec b/redhat/applications/kerry/kerry-3.5.13.spec
index 49b070395..ead20877c 100644
--- a/redhat/applications/kerry/kerry-3.5.13.spec
+++ b/redhat/applications/kerry/kerry-3.5.13.spec
@@ -1,11 +1,6 @@
 # Default version for this component
 %define kdecomp kerry
 
-# 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
@@ -26,7 +21,7 @@
 Name:		trinity-%{kdecomp}
 Summary:	a KDE frontend for the Beagle desktop search daemon [Trinity]
 Version:	0.2.1
-Release:	1%{?dist}%{?_variant}
+Release:	1%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -78,7 +73,7 @@ filesystems, chat logs, mail and data, RSS and other.
   -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__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"
 
 
@@ -148,6 +143,4 @@ update-desktop-database %{tde_appdir} &> /dev/null
 %{tde_datadir}/icons/hicolor/*/*/*
 
 
-%Changelog
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.2.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+%changelog