From 6581dc50b83f203d65eac61c00a159ab2a6ddb5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 30 Jan 2021 14:34:02 +0100 Subject: RPM: massive update and cleanup --- .../applications/kcpuload/kcpuload-3.5.13.2.spec | 125 --------------------- redhat/applications/kcpuload/kcpuload.spec | 10 +- 2 files changed, 4 insertions(+), 131 deletions(-) delete mode 100644 redhat/applications/kcpuload/kcpuload-3.5.13.2.spec (limited to 'redhat/applications/kcpuload') diff --git a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec b/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec deleted file mode 100644 index df8ec2705..000000000 --- a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec +++ /dev/null @@ -1,125 +0,0 @@ -# Default version for this component -%define tde_pkg kcpuload -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/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: a CPU meter for Kicker [Trinity] -Version: 2.00 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -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 - - -%description -KCPULoad is a small program for Kicker (the TDE panel). It shows a -recent history of CPU usage in the form of one or two configurable -diagrams in the system tray. These diagrams have settings for colours -and various different styles. - -KCPULoad has support for SMP and separate user/system loads. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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 \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%post -for f in crystalsvg locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -for f in crystalsvg locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/kcpuload -%{tde_datadir}/applnk/System/kcpuload.desktop -%{tde_datadir}/apps/kcpuload/icons/*/*/*/*.png -%{tde_datadir}/icons/crystalsvg/*/apps/kcpuload.png -%{tde_datadir}/icons/locolor/*/apps/kcpuload.png -%{tde_tdedocdir}/HTML/en/kcpuload/ - - -%changelog diff --git a/redhat/applications/kcpuload/kcpuload.spec b/redhat/applications/kcpuload/kcpuload.spec index cda688320..437b8b9dd 100644 --- a/redhat/applications/kcpuload/kcpuload.spec +++ b/redhat/applications/kcpuload/kcpuload.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 kcpuload %define tde_prefix /opt/trinity @@ -144,14 +144,12 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -# Fix desktop icon location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/System/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" +%find_lang %{tde_pkg} || touch %{tde_pkg}.lang # Fix desktop files (openSUSE only) echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %if 0%{?suse_version} -%suse_update_desktop_file kcpuload System Monitor +%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System Monitor %endif @@ -159,7 +157,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/kcpuload %{tde_tdeappdir}/kcpuload.desktop -- cgit v1.2.3