RPM: massive update and cleanup

2 files changed, 1 insertions, 147 deletions

diff --git a/redhat/applications/ksensors/ksensors-3.5.13.2.spec b/redhat/applications/ksensors/ksensors-3.5.13.2.spec
deleted file mode 100644
index e1874db69..000000000
--- a/redhat/applications/ksensors/ksensors-3.5.13.2.spec
+++ /dev/null
@@ -1,139 +0,0 @@
-# Default version for this component
-%define tde_pkg ksensors
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%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/kde
-%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:20}%{?preversion:19_%{preversion}}%{?dist}
-
-Summary:        Trinity Frontend to lm_sensors
-Group:          Applications/System
-License:        GPLv2+
-URL:            http://ksensors.sourceforge.net/
-
-Source0:		%{tde_pkg}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-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
-
-%if 0%{?suse_version}
-BuildRequires:	libsensors4-devel
-%else
-BuildRequires:	lm_sensors-devel
-%endif
-
-# 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}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{tde_pkg}-%{version}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__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
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__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
-
-%find_lang %{tde_pkg}
-
-
-%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
-%lang(es) %doc LEEME
-%lang(de) %doc LIESMICH
-%lang(fr) %doc LISEZMOI
-%{tde_bindir}/ksensors
-%{tde_datadir}/applnk/System/ksensors.desktop
-%{tde_datadir}/apps/ksensors/
-%{tde_datadir}/autostart/ksensors.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ksensors.png
-%{tde_datadir}/icons/locolor/*/apps/ksensors.png
-%{tde_datadir}/sounds/ksensors_alert.wav
-%{tde_tdedocdir}/HTML/en/ksensors/
-
-
-%changelog
diff --git a/redhat/applications/ksensors/ksensors.spec b/redhat/applications/ksensors/ksensors.spec
index ba1b1f917..e26f4f704 100644
--- a/redhat/applications/ksensors/ksensors.spec
+++ b/redhat/applications/ksensors/ksensors.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
 %endif
 %define tde_pkg ksensors
 %define tde_prefix /opt/trinity
@@ -149,10 +149,6 @@ fi
 %__rm -rf $RPM_BUILD_ROOT
 %__make install DESTDIR=$RPM_BUILD_ROOT -C build
 
-# 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
@@ -168,9 +164,6 @@ fi
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ README TODO
-%lang(es) %doc LEEME
-%lang(de) %doc LIESMICH
-%lang(fr) %doc LISEZMOI
 %{tde_bindir}/ksensors
 %{tde_tdeappdir}/ksensors.desktop
 %{tde_datadir}/apps/ksensors/