RPM: merge redhat directory with master branch

2 files changed, 73 insertions, 62 deletions

diff --git a/redhat/applications/ksensors/ksensors-14.0.0.spec b/redhat/applications/ksensors/ksensors-14.0.0.spec
index f0396bafa..dc9f5bf06 100644
--- a/redhat/applications/ksensors/ksensors-14.0.0.spec
+++ b/redhat/applications/ksensors/ksensors-14.0.0.spec
@@ -1,48 +1,81 @@
-# 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
+#
+# spec file for package ksensors (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
 %endif
-
-# Default version for this component
 %define tde_pkg ksensors
-%define tde_version 14.0.0
-
-# TDE specific building variables
+%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_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-ksensors
-Version:		0.7.3
-Release:		%{?!preversion:21}%{?preversion:20_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.7.3
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Trinity Frontend to lm_sensors
+Group:		Applications/System
+URL:		http://ksensors.sourceforge.net/
 
-Summary:        Trinity Frontend to lm_sensors
-Group:          Applications/System
-License:        GPLv2+
-URL:            http://ksensors.sourceforge.net/
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-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:	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
+
 %if 0%{?suse_version}
 BuildRequires:	libsensors4-devel
 %else
@@ -52,22 +85,27 @@ BuildRequires:	lm_sensors-devel
 # Keep archs in sync with lm_sensors
 ExcludeArch:    s390 s390x
 
+
 %description
 KSensors is a nice lm-sensors frontend for the K Desktop Environment.
 Install the hddtemp package if you wish to monitor hard disk
 temperatures with KSensors.
 
 
-%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"
 
 
@@ -99,31 +137,22 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf $RPM_BUILD_ROOT
 %__make install DESTDIR=$RPM_BUILD_ROOT
 
-# Creates autostart shortcut
-%__install -dm 755 $RPM_BUILD_ROOT%{tde_datadir}/autostart
-%__ln_s ../applnk/Utilities/ksensors.desktop \
-    $RPM_BUILD_ROOT%{tde_datadir}/autostart
+# Move desktop icon to correct location
+%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
 
 %find_lang %{tde_pkg}
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -G "Sensors Frontend" %{tde_pkg} System Monitor
+%endif
+
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
 
 
-%post
-for f in locolor hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null || :
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null || :
-done
-
-%postun
-for f in locolor hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null || :
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null || :
-done
-
-
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ README TODO
@@ -131,7 +160,7 @@ done
 %lang(de) %doc LIESMICH
 %lang(fr) %doc LISEZMOI
 %{tde_bindir}/ksensors
-%{tde_datadir}/applnk/System/ksensors.desktop
+%{tde_tdeappdir}/ksensors.desktop
 %{tde_datadir}/apps/ksensors/
 %{tde_datadir}/autostart/ksensors.desktop
 %{tde_datadir}/icons/hicolor/*/apps/ksensors.png
@@ -141,11 +170,3 @@ done
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-21
-- Initial release for TDE 14.0.0
-
-* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-20
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p3
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/applications/ksensors/ksensors-3.5.13.2.spec b/redhat/applications/ksensors/ksensors-3.5.13.2.spec
index 2b14d2946..e1874db69 100644
--- a/redhat/applications/ksensors/ksensors-3.5.13.2.spec
+++ b/redhat/applications/ksensors/ksensors-3.5.13.2.spec
@@ -1,8 +1,3 @@
-# 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
-
 # Default version for this component
 %define tde_pkg ksensors
 %define tde_version 3.5.13.2
@@ -24,7 +19,7 @@
 
 Name:			trinity-ksensors
 Version:		0.7.3
-Release:		%{?!preversion:20}%{?preversion:19_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:20}%{?preversion:19_%{preversion}}%{?dist}
 
 Summary:        Trinity Frontend to lm_sensors
 Group:          Applications/System
@@ -67,7 +62,7 @@ temperatures with KSensors.
 %setup -q -n %{tde_pkg}-%{version}
 
 %__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"
 
 
@@ -142,8 +137,3 @@ done
 
 
 %changelog
-* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-20
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p3
-- Initial release for TDE 3.5.13.1