From 6fbbac6e79a4c4f6dcfe6902a2e217fe321423f4a07c277a2f1f443d77b24dc3 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 25 Apr 2011 15:12:40 +0000 Subject: [PATCH] Accepting request 68326 from home:vuntz:branches:GNOME:Factory ok OBS-URL: https://build.opensuse.org/request/show/68326 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-system-monitor?expand=0&rev=56 --- gnome-system-monitor.changes | 7 +++++-- gnome-system-monitor.spec | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gnome-system-monitor.changes b/gnome-system-monitor.changes index 7d0ae41..44ef3bc 100644 --- a/gnome-system-monitor.changes +++ b/gnome-system-monitor.changes @@ -20,8 +20,11 @@ Mon Mar 28 13:48:29 UTC 2011 - fcrozat@novell.com - Change old-style buildRequires to new pkgconfig() / gnome3 ones: gtkmm2-devel, gtk2-devel, libwnck-devel, to gtkmm-3.0, libwnck-3.0. -- Replace file dependency with package dependency for lsb-release -- Replace GConf2 schemas handling with GSettings schemas handling. +- Replace /usr/bin/lsb_release Requires with lsb-release (which is + a package). +- Replace GConf2 schemas handling with GSettings schemas handling, + with %glib2_gsettings_schema_* macros. +- Drop gconf2-devel BuildRequires. ------------------------------------------------------------------- Fri Mar 11 14:43:14 UTC 2011 - fcrozat@novell.com diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec index 67cb098..50043b6 100644 --- a/gnome-system-monitor.spec +++ b/gnome-system-monitor.spec @@ -24,14 +24,14 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gnome-doc-utils-devel BuildRequires: gnome-icon-theme-devel -BuildRequires: pkgconfig(gtkmm-3.0) BuildRequires: intltool BuildRequires: libgtop-devel BuildRequires: librsvg-devel -BuildRequires: pkgconfig(libwnck-3.0) BuildRequires: libxml2-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +BuildRequires: pkgconfig(gtkmm-3.0) +BuildRequires: pkgconfig(libwnck-3.0) License: GPLv2+ Group: System/GUI/GNOME Version: 3.0.0 @@ -94,10 +94,10 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/omf/%{name}/%{name}-C.omf %{_bindir}/gnome-system-monitor %{_datadir}/applications/gnome-system-monitor.desktop -%{_datadir}/pixmaps/*.png -%{_datadir}/pixmaps/gnome-system-monitor/ %{_datadir}/glib-2.0/schemas/org.gnome.gnome-system-monitor.enums.xml %{_datadir}/glib-2.0/schemas/org.gnome.gnome-system-monitor.gschema.xml +%{_datadir}/pixmaps/*.png +%{_datadir}/pixmaps/gnome-system-monitor/ %files lang -f %{name}.lang