Accepting request 581053 from GNOME:Next

spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/581053
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/geoclue2?expand=0&rev=64

geoclue2.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb 28 16:26:22 UTC 2018 - dimstar@opensuse.org
+
+- Modernize spec-file by calling spec-cleaner
+
 -------------------------------------------------------------------
 Mon May 29 14:38:56 UTC 2017 - zaitor@opensuse.org
 

geoclue2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package geoclue2
 #
-# 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
@@ -21,15 +21,15 @@ Name:           geoclue2
 Version:        2.4.7
 Release:        0
 Summary:        GeoLocation Framework
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Development/Libraries/C and C++
-Url:            http://people.freedesktop.org/~zeenix/releases/
+URL:            http://people.freedesktop.org/~zeenix/releases/
 Source:         http://www.freedesktop.org/software/geoclue/releases/2.4/%{_name}-%{version}.tar.xz
 Source1:        srvGeoClue.conf
 Source99:       geoclue2-rpmlintrc
 BuildRequires:  gtk-doc
 BuildRequires:  intltool >= 0.40.0
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  sysuser-tools
 BuildRequires:  perl(XML::Parser)
@@ -43,13 +43,12 @@ BuildRequires:  pkgconfig(json-glib-1.0) >= 0.14
 BuildRequires:  pkgconfig(libsoup-2.4) >= 2.42
 BuildRequires:  pkgconfig(mm-glib) >= 1.0
 BuildRequires:  pkgconfig(systemd)
-# we require shadow for useradd
-Requires(pre):  shadow
 # This daemon runs as srvGeoClue
 Requires:       user(srvGeoClue)
+# we require shadow for useradd
+Requires(pre):  shadow
 # Virtual provides for the dbus service
 Provides:       dbus(org.freedesktop.GeoClue2) = %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{?systemd_requires}
 
 %description
@@ -97,7 +96,7 @@ make %{?_smp_mflags} V=1
 %sysusers_generate_pre %{SOURCE1} srvGeoClue
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 install -d %{buildroot}%{_localstatedir}/lib/srvGeoClue
 mkdir -p %{buildroot}%{_sysusersdir}
 install -m 644 %{SOURCE1} %{buildroot}%{_sysusersdir}/system-user-srvGeoClue.conf
@@ -108,14 +107,12 @@ find %{buildroot} -type f -name "geoclue-demo-agent.desktop" -delete -print
 # note: do not use systemd macros for geoclue2.service, they are not meant for dbus unit files.
 
 %pre -n system-user-srvGeoClue -f srvGeoClue.pre
-
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%license COPYING
-%doc README COPYING
+%doc README
 # Not split per SLPP as the interface to the underlying daemon is
 # too strict to allow parallel installations
 %{_libdir}/libgeoclue-2.so.*
@@ -139,17 +136,15 @@ find %{buildroot} -type f -name "geoclue-demo-agent.desktop" -delete -print
 %{_unitdir}/geoclue.service
 
 %files -n system-user-srvGeoClue
-%defattr(-,root,root)
 %attr(0700,srvGeoClue,root) %{_localstatedir}/lib/srvGeoClue
 %{_sysusersdir}/system-user-srvGeoClue.conf
 
 %files -n typelib-1_0-Geoclue-2_0
-%defattr(-,root,root)
 %{_libdir}/girepository-1.0/Geoclue-2.0.typelib
 
 %files devel
-%defattr(-,root,root)
+%license COPYING
-%doc README COPYING
+%doc README
 %{_includedir}/libgeoclue-2.0/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/geoclue-2.0.pc