RPM: merge redhat directory with master branch

2 files changed, 79 insertions, 53 deletions

diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec
index efe337232..ef32736f0 100644
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec
+++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec
@@ -1,41 +1,57 @@
-# Default version for this component
-%define tde_pkg gtk-qt-engine
+#
+# spec file for package gtk-qt-engine (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 gtk-qt-engine
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
 %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}/tde
+%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}
-
 
 Name:			trinity-%{tde_pkg}
-Summary:		theme engine using Qt for GTK+ 2.x and Trinity
+Epoch:			%{tde_epoch}
 Version:		0.8
-Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
-
-License:		GPLv2+
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Theme engine using Qt for GTK+ 2.x and Trinity
 Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
 URL:			http://www.trinitydesktop.org/
 
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
 Prefix:			%{_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -44,13 +60,41 @@ Source1:		gtk-qt-engine.rc.sh
 Source2:		gtkrc-2.0-kde4
 Source3:		gtkrc-2.0-kde-kde4
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
+
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
+BuildRequires:	cmake
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# GTK2 support
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
+BuildRequires:	gtk2-devel
+%endif
+%if 0%{?mgaversion} >= 5
+BuildRequires:	%{_lib}gtk+2.0-devel
+%endif
+%if 0%{?mdkversion}
+%if 0%{?pclinuxos}
+BuildRequires:	%{_lib}gtk+2.0_0-devel
+%else
+BuildRequires:	gtk+2.0-devel
+%endif
+%endif
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
 
 
 %description
@@ -63,10 +107,14 @@ Please note that this package is targeted at Trinity users and therefore provide
 a way to configure it from within KControl.
 
 
-%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}}
@@ -124,17 +172,22 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_tdelibdir}/kcm_kcmgtk.la
 %{tde_tdelibdir}/kcm_kcmgtk.so
 %{tde_appdir}/kcmgtk.desktop
+%dir %{tde_datadir}/kgtk
 %{tde_datadir}/kgtk/gtk-qt-engine.rc.sh
 %{tde_datadir}/kgtk/.gtkrc-2.0-kde4
 %{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4
 %{tde_tdedocdir}/HTML/en/kcmgtk/
 
 # The following files are outside TDE's directory
+%dir %{_libdir}/gtk-2.0
+%dir %{_libdir}/gtk-2.0/2.10.0
+%dir %{_libdir}/gtk-2.0/2.10.0/engines
 %{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.la
 %{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.so
+%dir %{_datadir}/themes
+%dir %{_datadir}/themes/Qt
+%dir %{_datadir}/themes/Qt/gtk-2.0
 %{_datadir}/themes/Qt/gtk-2.0/gtkrc
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8-7
-- Initial release for TDE 14.0.0
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec
index cde2e6341..d6c1a5311 100644
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec
+++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec
@@ -2,11 +2,6 @@
 %define tde_pkg gtk-qt-engine
 %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:		theme engine using Qt for GTK+ 2.x and Trinity
 Version:		0.8
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
 
 License:		GPLv2+
 Group:			Applications/Utilities
@@ -149,25 +144,3 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %changelog
-* Mon Jan 06 2014 Francois Andriot <francois.andriot@free.fr> - 0.8-7
-- Backport fixes from R14
-
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.8-6
-- Build for Fedora 19
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8-5
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-4
-- Initial release for TDE 3.5.13.1
-
-* Mon Aug 27 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3
-- Add missing gtkrc files
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-2
-- Rebuilt for Fedora 17
-- Fix FTBFS with newer glib
-- Removes useless post and postun
-
-* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16