From 3158a5914cf359bcfc147b6fe77b8b8f0a1ee7310c9d4dd467a91ec4063544f8 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 5 Mar 2018 13:55:28 +0000
Subject: [PATCH] Accepting request 581228 from GNOME:Next

spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/581228
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libgtop?expand=0&rev=82
---
 libgtop.changes |  5 +++++
 libgtop.spec    | 46 ++++++++++++++++++----------------------------
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/libgtop.changes b/libgtop.changes
index bca5ad1..c2a12fa 100644
--- a/libgtop.changes
+++ b/libgtop.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb 28 16:35:09 UTC 2018 - dimstar@opensuse.org
+
+- Modernize spec-file by calling spec-cleaner
+
 -------------------------------------------------------------------
 Mon Sep 11 23:17:03 UTC 2017 - zaitor@opensuse.org
 
diff --git a/libgtop.spec b/libgtop.spec
index bdf524d..8534f46 100644
--- a/libgtop.spec
+++ b/libgtop.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libgtop
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,24 +16,24 @@
 #
 
 
+%define sover 11
 Name:           libgtop
 Version:        2.38.0
 Release:        0
-%define sover 11
 Summary:        System status information library
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Development/Libraries/C and C++
-Url:            https://developer.gnome.org/libgtop/stable/
+URL:            https://developer.gnome.org/libgtop/stable/
 Source:         http://download.gnome.org/sources/libgtop/2.38/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
 BuildRequires:  glib2-devel
 BuildRequires:  gobject-introspection-devel
+BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(gobject-2.0) >= 2.26.0
+BuildRequires:  pkgconfig(xau)
 %if !0%{?is_opensuse}
 BuildRequires:  translation-update-upstream
 %endif
-BuildRequires:  pkgconfig(gobject-2.0) >= 2.26.0
-BuildRequires:  pkgconfig(xau)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 A library that fetches information about the running system, such as
@@ -50,10 +50,6 @@ Recommends:     %{name}-lang
 # Needed to make lang package installable
 Provides:       %{name} = %{version}
 Obsoletes:      %{name} < %{version}
-# bug437293
-%ifarch ppc64
-Obsoletes:      libgtop-64bit
-%endif
 #
 
 %description -n libgtop-2_0-%{sover}
@@ -83,12 +79,9 @@ Summary:        Development files for libgtop
 Group:          Development/Libraries/GNOME
 Requires:       libgtop-2_0-%{sover} = %{version}
 Requires:       typelib-1_0-GTop-2_0 = %{version}
-# bug437293
-%ifarch ppc64
-Obsoletes:      libgtop-devel-64bit
-%endif
+# FIXME: use proper Requires(pre/post/preun/...)
 #
-PreReq:         %install_info_prereq
+PreReq:         %{install_info_prereq}
 
 %description devel
 This package contains all necessary include files and libraries needed
@@ -98,6 +91,7 @@ to develop applications that require these.
 Summary:        Documentation for the libgtop library
 Group:          Development/Libraries/GNOME
 Requires:       libgtop-2_0-%{sover} = %{version}
+# FIXME: use proper Requires(pre/post/preun/...)
 PreReq:         /sbin/install-info
 
 %description doc
@@ -109,6 +103,7 @@ file system. On other systems, a server is used to read information
 from /dev/kmem.
 
 %lang_package
+
 %prep
 %setup -q
 %if !0%{?is_opensuse}
@@ -122,33 +117,29 @@ translation-update-upstream po libgtop
 make %{?_smp_mflags}
 
 %install
-%makeinstall
-find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
+%make_install
+find %{buildroot} -type f -name "*.la" -delete -print
 %find_lang %{name} %{?no_lang_C}
 
 %post -n libgtop-2_0-%{sover} -p /sbin/ldconfig
-
 %postun -n libgtop-2_0-%{sover} -p /sbin/ldconfig
-
 %preun doc
-%install_info_delete --info-dir=%{_datadir}/info %{_datadir}/info/%{name}2.info.gz
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}2.info.gz
 
 %post doc
-%install_info --info-dir=%{_datadir}/info %{_datadir}/info/%{name}2.info.gz
+%install_info --info-dir=%{_infodir} %{_infodir}/%{name}2.info.gz
 
 %files lang -f %{name}.lang
 
 %files -n libgtop-2_0-%{sover}
-%defattr(-, root, root)
-%doc AUTHORS COPYING NEWS README copyright.txt
+%license COPYING
+%doc AUTHORS NEWS README copyright.txt
 %{_libdir}/*.so.*
 
 %files -n typelib-1_0-GTop-2_0
-%defattr(-, root, root)
 %{_libdir}/girepository-1.0/GTop-2.0.typelib
 
 %files devel
-%defattr(-, root, root)
 %{_includedir}/libgtop-2.0
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
@@ -156,7 +147,6 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
 %doc %{_datadir}/gtk-doc/html/libgtop/
 
 %files doc
-%defattr(-, root, root)
-%doc %{_infodir}/*.info*
+%{_infodir}/*.info*
 
 %changelog