- Update to version 1.5.0
+ migrate to gsettings and drop all mateconf-2.0 stuff + fix POTFILES - Add mate-system-monitor-1.5.0-fix_desktop_file.patch - fix desktop file, add missing semi-colon - merged upstream - Add desktop database macros - Add side-openSUSE.png: add openSUSE branded icon instead of the OBS-URL: https://build.opensuse.org/package/show/X11:MATE:Factory/mate-system-monitor?expand=0&rev=2
This commit is contained in:
parent
dedc922ea0
commit
c0502f6072
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:331919edb9049c14c96687edde16cec14b7f7815d422da15cd7f1ce6c9c287a9
|
||||
size 1908152
|
25
mate-system-monitor-1.5.0-fix_desktop_file.patch
Normal file
25
mate-system-monitor-1.5.0-fix_desktop_file.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From 6d06a224d764c5b58127f665b2fcfa7eeac080ee Mon Sep 17 00:00:00 2001
|
||||
From: Nelson Marques <nmo.marques@gmail.com>
|
||||
Date: Wed, 7 Nov 2012 16:30:59 +0000
|
||||
Subject: [PATCH] add missing semi-colon to OnlyShowIn desktop file
|
||||
|
||||
---
|
||||
mate-system-monitor.desktop.in.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/mate-system-monitor.desktop.in.in b/mate-system-monitor.desktop.in.in
|
||||
index 78b6353..655e235 100644
|
||||
--- a/mate-system-monitor.desktop.in.in
|
||||
+++ b/mate-system-monitor.desktop.in.in
|
||||
@@ -8,7 +8,7 @@ Terminal=false
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
Categories=GTK;System;Monitor;
|
||||
-OnlyShowIn=MATE
|
||||
+OnlyShowIn=MATE;
|
||||
X-MATE-Bugzilla-Bugzilla=MATE
|
||||
X-MATE-Bugzilla-Product=system-monitor
|
||||
X-MATE-Bugzilla-Component=general
|
||||
--
|
||||
1.7.12
|
||||
|
3
mate-system-monitor-1.5.0.tar.xz
Normal file
3
mate-system-monitor-1.5.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dfae9e752eeaf1c99230cdb083a97bb0dd5803b173339357a2deefa9f83453e5
|
||||
size 1906492
|
@ -1,7 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 7 16:31:59 UTC 2012 - nmo.marques@gmail.com
|
||||
|
||||
- Update to version 1.5.0
|
||||
+ migrate to gsettings and drop all mateconf-2.0 stuff
|
||||
+ fix POTFILES
|
||||
- Add mate-system-monitor-1.5.0-fix_desktop_file.patch - fix
|
||||
desktop file, add missing semi-colon - merged upstream
|
||||
- Add desktop database macros
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 1 17:19:01 UTC 2012 - nmo.marques@gmail.com
|
||||
|
||||
- add side-openSUSE.png: add openSUSE branded icon instead of the
|
||||
- Add side-openSUSE.png: add openSUSE branded icon instead of the
|
||||
upstream ugly one!
|
||||
|
||||
-------------------------------------------------------------------
|
||||
|
@ -2,7 +2,7 @@
|
||||
# spec file for mate-system-monitor
|
||||
#
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2012 Nelson Marques <nmo.marques@gmail.com>
|
||||
# Copyright (c) 2012 Nelson Marques <nmarques@gmail.com>
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: mate-system-monitor
|
||||
Version: 1.4.0
|
||||
Version: 1.5.0
|
||||
Release: 0
|
||||
License: GPL-2.0+
|
||||
Summary: MATE Desktop system monitor
|
||||
@ -27,12 +27,19 @@ Source0: http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.
|
||||
# openSUSE branded image to replace original
|
||||
Source1: side-openSUSE.png
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%glib2_gsettings_schema_requires
|
||||
|
||||
# PATCH-FIX-UPSTREAM mate-system-monitor-1.5.0-fix_desktop_file.patch nmarques@mate-desktop.org
|
||||
# add missing semi-colon to OnlyShowIn in desktop file - upstreamed
|
||||
Patch0: %{name}-1.5.0-fix_desktop_file.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: libxml2-python
|
||||
BuildRequires: mate-common
|
||||
BuildRequires: pkgconfig(dconf)
|
||||
BuildRequires: pkgconfig(dbus-glib-1)
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(libgtop-2.0)
|
||||
BuildRequires: pkgconfig(libmatewnck)
|
||||
BuildRequires: pkgconfig(librsvg-2.0)
|
||||
@ -41,13 +48,11 @@ BuildRequires: pkgconfig(glibmm-2.4)
|
||||
BuildRequires: pkgconfig(giomm-2.4)
|
||||
BuildRequires: pkgconfig(gtk+-2.0)
|
||||
BuildRequires: pkgconfig(gtkmm-2.4)
|
||||
BuildRequires: pkgconfig(mateconf-2.0)
|
||||
BuildRequires: pkgconfig(mate-doc-utils)
|
||||
BuildRequires: pkgconfig(mate-icon-theme)
|
||||
BuildRequires: pkgconfig(gtkmm-2.4)
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: xz
|
||||
%mateconf_schemas_requires
|
||||
|
||||
%lang_package
|
||||
|
||||
@ -59,20 +64,19 @@ as CPU and memory.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
%configure \
|
||||
--disable-static \
|
||||
--libexecdir=/usr/lib/${pkgname} \
|
||||
--disable-scrollkeeper \
|
||||
--disable-schemas-install
|
||||
--libexecdir=%{_libexecdir}/${name} \
|
||||
--disable-scrollkeeper
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%makeinstall
|
||||
%find_lang %{name}
|
||||
%find_mateconf_schemas
|
||||
%find_lang %{name} %{?no_lang_C}
|
||||
%suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop
|
||||
%fdupes %{buildroot}%{_datadir}/mate
|
||||
if [ -f %{buildroot}%{_datadir}/pixmaps/%{name}/side.png ]; then
|
||||
@ -80,23 +84,24 @@ if [ -f %{buildroot}%{_datadir}/pixmaps/%{name}/side.png ]; then
|
||||
install -D -m 0644 %{S:1} %{buildroot}%{_datadir}/pixmaps/%{name}/side.png
|
||||
fi
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
%post
|
||||
%glib2_gsettings_schema_post
|
||||
%desktop_database_post
|
||||
|
||||
%pre -f %{name}.schemas_pre
|
||||
%postun
|
||||
%glib2_gsettings_schema_postun
|
||||
%desktop_database_post
|
||||
|
||||
%preun -f %{name}.schemas_preun
|
||||
|
||||
%posttrans -f %{name}.schemas_posttrans
|
||||
|
||||
%files -f %{name}.schemas_list
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS COPYING
|
||||
%dir %{_datadir}/mateconf/schemas
|
||||
%dir %{_datadir}/omf/%{name}
|
||||
%{_bindir}/mate-system-monitor
|
||||
%{_datadir}/applications/mate-system-monitor.desktop
|
||||
%{_datadir}/pixmaps/%{name}/
|
||||
%{_datadir}/mate/help/
|
||||
%{_datadir}/glib-2.0/schemas/*.xml
|
||||
%{_datadir}/omf/%{name}/%{name}-C.omf
|
||||
|
||||
%files lang -f %{name}.lang
|
||||
%defattr(-,root,root,-)
|
||||
|
Loading…
x
Reference in New Issue
Block a user