From 0e19f8320f71d8bab305fb1d7e51c8ae7187bad8df3e4a75ec3cd10c5b0336b0 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 27 May 2010 22:59:15 +0000 Subject: [PATCH] Accepting request 40760 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gnome-system-monitor via accept of submit request 40760 revision 3. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/40760 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-system-monitor?expand=0&rev=45 --- gnome-system-monitor.changes | 13 +++++++++++++ gnome-system-monitor.spec | 12 +----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/gnome-system-monitor.changes b/gnome-system-monitor.changes index 8853262..43c5c2f 100644 --- a/gnome-system-monitor.changes +++ b/gnome-system-monitor.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri May 28 00:45:03 CEST 2010 - vuntz@opensuse.org + +- Drop gnome-system-monitor-fate302198.diff and + gnome-system-monitor-fate304741.diff: those patches were not + accepted upstream. One depends on HAL (which we don't want) and + provides an UI that is suboptimal to list the hardware; the other + one is specific to thinkpads and doesn't bring enough benefits to + be kept. +- Drop hal-devel and hwinfo-devel BuildRequires. +- Remove autoreconf call, and remove non-existing --enable-pcrecpp + configure option. + ------------------------------------------------------------------- Tue Mar 30 19:45:52 CEST 2010 - vuntz@opensuse.org diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec index faad112..47c00d6 100644 --- a/gnome-system-monitor.spec +++ b/gnome-system-monitor.spec @@ -33,17 +33,11 @@ BuildRequires: librsvg-devel BuildRequires: libwnck-devel BuildRequires: libxml2-devel BuildRequires: update-desktop-files -BuildRequires: hal-devel -BuildRequires: hwinfo-devel License: GPLv2+ Group: System/GUI/GNOME Version: 2.28.1 Release: 1 Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.24/%{name}-%{version}.tar.bz2 -# PATCH-FEATURE-OPENSUSE gnome-system-monitor-fate302198.diff FATE#302198 bgo582311 hfiguiere@novell.com -- Add a hardware tab -Patch1: gnome-system-monitor-fate302198.diff -# PATCH-FEATURE-OPENSUSE gnome-system-monitor-fate304741.diff FATE#304741 bgo582312 hfiguiere@novell.com -- Add a thinkpad tab -Patch2: gnome-system-monitor-fate304741.diff Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A Simple Process Monitor @@ -66,14 +60,10 @@ Authors: %lang_package %prep %setup -q -%patch1 -%patch2 -p1 %build -autoreconf -si %configure \ - --disable-scrollkeeper \ - --enable-pcrecpp + --disable-scrollkeeper %__make %{?jobs:-j%jobs} %install