RPM: merge redhat directory with master branch

4 files changed, 30 insertions, 67 deletions

diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec
index 767dd726b..f9d3be544 100644
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec
+++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec
@@ -1,10 +1,24 @@
+#
+# spec file for package kaffeine-mozilla (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 kaffeine-mozilla
+%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
@@ -23,11 +37,14 @@
 
 %define _docdir %{tde_docdir}
 
+%if 0%{?fedora} >= 27
+%define debug_package %{nil}
+%endif
 
 Name:			trinity-%{tde_pkg}
 Summary:		mozilla plugin that lanches kaffeine for supported media types [Trinity]
 Version:		0.4.3.1
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 
 License:		GPLv2+
 Group:			Applications/Multimedia
@@ -80,7 +97,7 @@ when a page containing a supported media format is loaded.
 %patch1 -p1 -b .nspr
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -115,13 +132,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 
 
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
@@ -131,5 +141,3 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-6
-- Initial release for TDE 14.0.0
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec
index 018c2d05b..e00b81a06 100644
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec
+++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec
@@ -1,11 +1,6 @@
 # Default version for this component
 %define kdecomp kaffeine-mozilla
 
-# 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:	mozilla plugin that lanches kaffeine for supported media types [Trinity]
 Version:	0.4.3.1
-Release:	3%{?dist}%{?_variant}
+Release:	3%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Multimedia
@@ -78,7 +73,7 @@ unset QTDIR; . /etc/profile.d/qt3.sh
 %patch1 -p1
 
 %__cp -f "/usr/share/aclocal/libtool.m4" .
-%__cp -f "/usr/share/libtool/config/ltmain.sh" . || %__cp "/usr/share/libtool/ltmain.sh" .
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" . || %__cp "/usr/share/libtool/ltmain.sh" .
 
 autoreconf -fiv
 
@@ -123,12 +118,3 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-3
-- Initial release for TDE 3.5.13.1
-
-* Thu Apr 26 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-2
-- Rebuild with nicer patch.
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1.dfsg-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec
index 21fc166b0..b2230c6b3 100644
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec
+++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec
@@ -2,11 +2,6 @@
 %define tde_pkg kaffeine-mozilla
 %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:		mozilla plugin that lanches kaffeine for supported media types [Trinity]
 Version:		0.4.3.1
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
 
 License:		GPLv2+
 Group:			Applications/Multimedia
@@ -83,7 +78,7 @@ when a page containing a supported media format is loaded.
 %patch2 -p1 -b .automake
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -134,18 +129,3 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-5
-- Build for Fedora 19
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-4
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-3
-- Initial release for TDE 3.5.13.1
-
-* Thu Apr 26 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-2
-- Rebuild with nicer patch.
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1.dfsg-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec
index dfbc6152d..fdaafa4b0 100644
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec
+++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec
@@ -1,11 +1,6 @@
 # Default version for this component
 %define kdecomp kaffeine-mozilla
 
-# 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:	mozilla plugin that lanches kaffeine for supported media types [Trinity]
 Version:	0.4.3.1
-Release:	2%{?dist}%{?_variant}
+Release:	2%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Multimedia
@@ -68,7 +63,7 @@ unset QTDIR; . /etc/profile.d/qt.sh
 %patch1 -p1
 
 %__cp -f "/usr/share/aclocal/libtool.m4" .
-%__cp -f "/usr/share/libtool/config/ltmain.sh" . || %__cp "/usr/share/libtool/ltmain.sh" .
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" . || %__cp "/usr/share/libtool/ltmain.sh" .
 
 autoreconf -fiv
 
@@ -112,10 +107,4 @@ export PATH="%{tde_bindir}:${PATH}"
 %{_libdir}/mozilla/plugins/kaffeineplugin.so
 
 
-%Changelog
-* Thu Apr 26 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-2
-- Rebuild with nicer patch.
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1.dfsg-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-
+%changelog