From af6a6e8ad126947c6c610121358e74e2c39abb6cf33da84fc06126f3680be002 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 17 Mar 2017 12:48:59 +0000 Subject: [PATCH] - Run spec-cleaner: + Add pkgconfig BuildRequires. + Use %make_install instead of %makeinstall. + Add %defattr(-,root,root) to the -lang package. - Use %_smp_mflags for parallel build and limit fdupes to not work across common partitions. Replace old-age $RPM_* by %-macros. OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-system-monitor?expand=0&rev=158 --- gnome-system-monitor.changes | 12 ++++++++++-- gnome-system-monitor.spec | 9 ++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/gnome-system-monitor.changes b/gnome-system-monitor.changes index 08835fe..106851e 100644 --- a/gnome-system-monitor.changes +++ b/gnome-system-monitor.changes @@ -1,8 +1,16 @@ +------------------------------------------------------------------- +Fri Mar 17 12:47:40 UTC 2017 - dimstar@opensuse.org + +- Run spec-cleaner: + + Add pkgconfig BuildRequires. + + Use %make_install instead of %makeinstall. + + Add %defattr(-,root,root) to the -lang package. + ------------------------------------------------------------------- Fri Mar 17 12:34:52 UTC 2017 - jengelh@inai.de -- Use %_smp_mflags for parallel build and limit fdupes to not - work across common partitions. Replace old-age $RPM_* by %-macros. +- Use %_smp_mflags for parallel build and limit fdupes to not work + across common partitions. Replace old-age $RPM_* by %-macros. ------------------------------------------------------------------- Tue Mar 14 18:57:08 UTC 2017 - mgorse@suse.com diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec index 919e600..6906e2e 100644 --- a/gnome-system-monitor.spec +++ b/gnome-system-monitor.spec @@ -19,16 +19,17 @@ Name: gnome-system-monitor Version: 3.23.92 Release: 0 -Url: http://www.gnome.org Summary: A Simple Process Monitor License: GPL-2.0+ Group: System/GUI/GNOME +Url: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-system-monitor/3.23/%{name}-%{version}.tar.xz # PATCH-FEATURE-UPSTREAM gsm-bsc1020294-add-resources-scrollbar.patch bsc#1020294 bgo#778697 mgorse@suse.com -- add a scrollbar to the resources tab. Patch0: gsm-bsc1020294-add-resources-scrollbar.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: intltool +BuildRequires: pkgconfig BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: yelp-tools @@ -53,6 +54,7 @@ GNOME-system-monitor is a simple process and system monitor for the GNOME Desktop. %lang_package + %prep %setup -q %patch0 -p1 @@ -64,12 +66,12 @@ translation-update-upstream make %{?_smp_mflags} V=1 %install -%makeinstall +%make_install echo DocPath=gnome-system-monitor >> %{buildroot}/%{_datadir}/applications/gnome-system-monitor.desktop %suse_update_desktop_file %{name} %suse_update_desktop_file %{name}-kde %find_lang %{name} %{?no_lang_C} -%fdupes %buildroot/%_prefix +%fdupes %{buildroot}/%{_prefix} %post %desktop_database_post @@ -98,5 +100,6 @@ echo DocPath=gnome-system-monitor >> %{buildroot}/%{_datadir}/applications/gnome %{_libexecdir}/%{name}/gsm-renice %files lang -f %{name}.lang +%defattr(-,root,root) %changelog