RPM packaging: update tde-systemsettings, tdesv, tdmtheme, tellico, tork, twin-style-crystal, wlassistant, yakuake

1 files changed, 73 insertions, 32 deletions

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 31a80d8be..338795cbe 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
+++ b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
@@ -1,74 +1,105 @@
-# Default version for this component
-%define tde_pkg tde-systemsettings
+#
+# spec file for package tde-systemsettings (version R14.0.0)
+#
+# 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
 %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_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-systemsettings
-Summary:		easy to use control centre for TDE
-Version:		0.0svn20070312
-Release:		%{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.0svn20070312
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Easy to use control centre for TDE
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org
 
-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
+Patch0:			%{tde_pkg}-%{tde_version}.patch
+
 
 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
 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}}
+%patch0 -p1
 
 %__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"
@@ -113,6 +144,13 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %__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"
+
+
 %clean
 %__rm -rf %{buildroot}
 
@@ -130,6 +168,9 @@ 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
@@ -139,7 +180,7 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null
 #%{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}/apps/systemsettings/
 %{tde_datadir}/config/systemsettingsrc
 %{tde_datadir}/desktop-directories/*.directory
 %{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
@@ -147,5 +188,5 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-9
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.0svn20070312-1
 - Initial release for TDE 14.0.0