Accepting request 584716 from GNOME:Factory

Scripted push of project GNOME:Next (forwarded request 583556 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/584716
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/colord?expand=0&rev=73

colord.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb 28 16:24:28 UTC 2018 - dimstar@opensuse.org
+
+- Modernize spec-file by calling spec-cleaner
+
 -------------------------------------------------------------------
 Fri Oct  6 10:55:06 UTC 2017 - dimstar@opensuse.org
 

colord.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package colord
 #
-# 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
@@ -17,14 +17,13 @@
 
 
 %define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
-
 Name:           colord
 Version:        1.4.1
 Release:        0
 Summary:        System Daemon for Managing Color Devices
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/Daemons
-Url:            http://colord.hughsie.com/
+URL:            http://colord.hughsie.com/
 Source0:        http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz
 Source1:        http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz.asc
 Source2:        %{name}.keyring
@@ -36,6 +35,7 @@ BuildRequires:  docbook-utils
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  gtk-doc
 BuildRequires:  meson
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(bash-completion) >= 2.0
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(gio-2.0) >= 2.25.9
@@ -53,11 +53,10 @@ BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(udev)
 BuildRequires:  pkgconfig(vapigen)
-Requires(pre):  pwdutils
 Requires:       argyllcms
 Requires:       colord-color-profiles
+Requires(pre):  pwdutils
 Recommends:     %{name}-lang
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{?systemd_requires}
 
 %description
@@ -138,6 +137,7 @@ It is used by gnome-color-manager for system integration and use when
 there are no users logged in.
 
 %lang_package
+
 %prep
 %setup -q
 
@@ -171,11 +171,11 @@ ulimit -Sv 2000000
 # Create colord rclink
 mkdir %{buildroot}/%{_sbindir}
 ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name}
-find %{buildroot} -type f -name '*.la' -delete -print
+find %{buildroot} -type f -name "*.la" -delete -print
 
 # Install Apparmor profile
-mkdir -p %{buildroot}/etc/apparmor.d/
+mkdir -p %{buildroot}%{_sysconfdir}/apparmor.d/
-install -c -m 644 %{SOURCE3} %{buildroot}/etc/apparmor.d/
+install -c -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/apparmor.d/
 %find_lang %{name}
 
 %pre
@@ -197,16 +197,13 @@ exit 0
 %service_del_postun %{name}.service
 
 %post -n libcolord2 -p /sbin/ldconfig
-
 %postun -n libcolord2 -p /sbin/ldconfig
-
 %post -n libcolorhug2 -p /sbin/ldconfig
-
 %postun -n libcolorhug2 -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%license COPYING
-%doc AUTHORS COPYING NEWS
+%doc AUTHORS NEWS
 %{_unitdir}/colord.service
 %{_udevrulesdir}/*.rules
 %attr(755,colord,colord) %dir %{_localstatedir}/lib/colord
@@ -232,8 +229,8 @@ exit 0
 %{_mandir}/man1/cd-fix-profile.1%{?ext_man}
 %{_mandir}/man1/cd-it8.1%{?ext_man}
 %{_mandir}/man1/colormgr.1%{?ext_man}
-%dir /etc/apparmor.d/
+%dir %{_sysconfdir}/apparmor.d/
-%config /etc/apparmor.d/usr.lib.colord
+%config %{_sysconfdir}/apparmor.d/usr.lib.colord
 %dir %{_libdir}/colord-plugins
 %{_libdir}/libcolordcompat.so
 %{_libdir}/colord-plugins/libcolord_sensor_camera.so
@@ -241,28 +238,22 @@ exit 0
 %{_sbindir}/rc%{name}
 
 %files color-profiles
-%defattr(-, root, root)
 %{_datadir}/color/
 
 %files -n libcolord2
-%defattr(-, root, root)
 %{_libdir}/libcolord.so.*
 %{_libdir}/libcolordprivate.so.*
 
 %files -n libcolorhug2
-%defattr(-,root,root)
 %{_libdir}/libcolorhug.so.*
 
 %files -n typelib-1_0-Colord-1_0
-%defattr(-,root,root)
 %{_libdir}/girepository-1.0/Colord-1.0.typelib
 
 %files -n typelib-1_0-Colorhug-1_0
-%defattr(-,root,root)
 %{_libdir}/girepository-1.0/Colorhug-1.0.typelib
 
 %files -n libcolord-devel
-%defattr(-, root, root)
 %{_includedir}/colord-1/
 %{_libdir}/libcolord.so
 %{_libdir}/libcolordprivate.so
@@ -278,6 +269,5 @@ exit 0
 %{_tmpfilesdir}/colord.conf
 
 %files lang -f %{name}.lang
-%defattr(-, root, root)
 
 %changelog