RPM: merge redhat directory with master branch

3 files changed, 85 insertions, 76 deletions

diff --git a/redhat/applications/tde-systemsettings/kde-settings-laptops.directory b/redhat/applications/tde-systemsettings/kde-settings-laptops.directory
index 687a493c4..d37d9ba13 100644
--- a/redhat/applications/tde-systemsettings/kde-settings-laptops.directory
+++ b/redhat/applications/tde-systemsettings/kde-settings-laptops.directory
@@ -11,3 +11,4 @@ Name[pt_BR]=Energia
 Name[ru]=Управление питанием
 Name[sv]=Effekt
 Icon=energy
+OnlyShowIn=TDE;
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
index a19ade93c..812b2329d 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
+++ b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
@@ -1,83 +1,116 @@
-# Default version for this component
-%define tde_pkg tde-systemsettings
+#
+# spec file for package tde-systemsettings (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
-# Currently, menu files under /etc/xdg conflict with KDE4
-%define tde_sysconfdir %{tde_prefix}/etc
 %endif
-
-# TDE specific building variables
+%define tde_pkg tde-systemsettings
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
 %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_sysconfdir %{_sysconfdir}/trinity
+%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}
+Epoch:		%{tde_epoch}
+Version:	0.0svn20070312
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Easy to use control centre for TDE
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org
 
-Name:			trinity-tde-systemsettings
-Summary:		easy to use control centre for TDE
-Version:		0.0svn20070312
-Release:		%{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant}
-
-License:		GPLv2+
-Group:			Applications/Utilities
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%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:			%{tde_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
 Source1:		kde-settings-laptops.directory
 
-Provides:	trinity-kde-systemsettings = %{version}-%{release}
-Obsoletes:	trinity-kde-systemsettings < %{version}-%{release}
-Provides:	trinity-systemsettings = %{version}-%{release}
-Obsoletes:	trinity-systemsettings < %{version}-%{release}
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
+Provides:	trinity-kde-systemsettings = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kde-systemsettings < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-systemsettings = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-systemsettings < %{?epoch:%{epoch}:}%{version}-%{release}
+
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# 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
+
 Requires:		trinity-guidance
 
+
 %description
 System preferences is a replacement for the TDE
 Control Centre with an improved user interface.
 
+##########
 
-%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}}
 
 %__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"
 
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
 
 
 %configure \
@@ -111,39 +144,39 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -f %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-power.directory
 %__rm -f %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-system.directory
 
-%clean
-%__rm -rf %{buildroot}
+%__rm -f %{buildroot}%{tde_datadir}/applications/tde/laptop.desktop
+
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/audioencoding.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/defaultapplication.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kcm_knetworkconfmodule_ss.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/medianotifications.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/systemsettings.desktop"
 
 
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-update-desktop-database %{tde_tdeappdir} -q &> /dev/null
+%clean
+%__rm -rf %{buildroot}
 
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-update-desktop-database %{tde_tdeappdir} -q &> /dev/null
 
 %files
 %defattr(-,root,root,-)
 %doc README TODO
+%dir %{tde_sysconfdir}/xdg
+%dir %{tde_sysconfdir}/xdg/menus
+%dir %{tde_sysconfdir}/xdg/menus/applications-merged
 %{tde_sysconfdir}/xdg/menus/applications-merged/tde-system-settings-merge.menu
 %{tde_sysconfdir}/xdg/menus/tde-system-settings.menu
 %{tde_bindir}/systemsettings
 %{tde_datadir}/applications/tde/audioencoding.desktop
 %{tde_datadir}/applications/tde/defaultapplication.desktop
 %{tde_datadir}/applications/tde/kcm_knetworkconfmodule_ss.desktop
-%{tde_datadir}/applications/tde/laptop.desktop
+#%{tde_datadir}/applications/tde/laptop.desktop
 %{tde_datadir}/applications/tde/medianotifications.desktop
 %{tde_datadir}/applications/tde/systemsettings.desktop
-%{tde_datadir}/apps/systemsettings/systemsettingsui.rc
-%{tde_datadir}/config/systemsettingsrc
+%{tde_datadir}/apps/systemsettings/
+%{tde_confdir}/systemsettingsrc
 %{tde_datadir}/desktop-directories/*.directory
 %{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
 %{tde_tdedocdir}/HTML/en/systemsettings/
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-9
-- Initial release for TDE 14.0.0
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec
index cf9b3a815..c06af35f6 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec
+++ b/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec
@@ -4,7 +4,6 @@
 
 # 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
 # Currently, menu files under /etc/xdg conflict with KDE4
 %define tde_sysconfdir %{tde_prefix}/etc
 %endif
@@ -29,7 +28,7 @@
 Name:			trinity-tde-systemsettings
 Summary:		easy to use control centre for TDE
 Version:		0.0svn20070312
-Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}
 
 License:		GPLv2+
 Group:			Applications/Utilities
@@ -71,7 +70,7 @@ Control Centre with an improved user interface.
 %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"
 
 
@@ -144,27 +143,3 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null
 
 
 %changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-8
-- Build for Fedora 19
-
-* Sat Jun 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-7
-- Rebuild
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-6
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-5
-- Initial release for TDE 3.5.13.1
-
-* Wed Jul 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-4
-- Fix XDG menu directory location (again)
-
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-3
-- Updates 'Requires: trinity-guidance' to reflect package renaming
-
-* Wed Dec 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-2
-- Fix XDG menu directory location
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-