Accepting request 582851 from GNOME:Factory

spec-cleaner (forwarded request 581284 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/582851
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libgnome-keyring?expand=0&rev=42

libgnome-keyring.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb 28 16:34:51 UTC 2018 - dimstar@opensuse.org
+
+- Modernize spec-file by calling spec-cleaner
+
 -------------------------------------------------------------------
 Wed Feb  8 16:06:36 UTC 2017 - dimstar@opensuse.org
 

libgnome-keyring.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libgnome-keyring
 #
-# 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
@@ -19,10 +19,10 @@
 Name:           libgnome-keyring
 Version:        3.12.0
 Release:        0
-Url:            http://www.gnome.org/
 Summary:        Library to integrate with the GNOME Keyring
-License:        GPL-2.0+ and LGPL-2.1+
+License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          Development/Libraries/GNOME
+URL:            http://www.gnome.org/
 Source:         http://download.gnome.org/sources/libgnome-keyring/3.12/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
 BuildRequires:  dbus-1-devel
@@ -34,7 +34,6 @@ BuildRequires:  libgcrypt-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  vala
 Recommends:     %{name}-lang
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The GNOME Keyring is a program that keep password and other secrets
@@ -82,6 +81,7 @@ for users. The libgnome-keyring library is used by applications to
 integrate with the GNOME Keyring system.
 
 %lang_package
+
 %prep
 %setup -q
 translation-update-upstream
@@ -89,32 +89,26 @@ translation-update-upstream
 %build
 %configure \
         --disable-static
-make %{?jobs:-j%jobs} V=1
+make %{?_smp_mflags} V=1
 
 %install
-%makeinstall
+%make_install
 %find_lang %{name}
 find %{buildroot} -type f -name "*.la" -delete -print
 %fdupes %{buildroot}
 
-%clean
-rm -rf %{buildroot}
-
 %post -n libgnome-keyring0 -p /sbin/ldconfig
-
 %postun -n libgnome-keyring0 -p /sbin/ldconfig
 
 %files -n libgnome-keyring0
-%defattr (-, root, root)
-%doc AUTHORS ChangeLog COPYING HACKING NEWS README
+%license COPYING
+%doc AUTHORS ChangeLog HACKING NEWS README
 %{_libdir}/libgnome-keyring.so.*
 
 %files -n typelib-1_0-GnomeKeyring-1_0
-%defattr(-,root,root)
 %{_libdir}/girepository-1.0/GnomeKeyring-1.0.typelib
 
 %files devel
-%defattr (-, root, root)
 %{_datadir}/gir-1.0/GnomeKeyring-1.0.gir
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc