Accepting request 704757 from home:cgiboudeaux:branches:hardware

- Run spec-cleaner
- Add the missing systemd build requirement.

OBS-URL: https://build.opensuse.org/request/show/704757
OBS-URL: https://build.opensuse.org/package/show/hardware/usbguard?expand=0&rev=14

usbguard.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 22 13:38:28 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Run spec-cleaner
+- Add the missing systemd build requirement.
+
 -------------------------------------------------------------------
 Tue Jan 15 16:28:33 UTC 2019 - Robert Frohl <rfrohl@suse.com>
 

usbguard.spec

@@ -17,9 +17,7 @@
 
 
 %global _hardened_build 1
-
 %define lname libusbguard0
-
 Name:           usbguard
 Version:        0.7.4
 Release:        0
@@ -35,8 +33,6 @@ Source2:        usbguard.keyring
 Source3:        usbguard-daemon.conf
 Source4:        usbguard-rpmlintrc
 Patch0:         usbguard-applet-qt_desktop_menu_categories.patch
-%{?systemd_requires}
-
 BuildRequires:  asciidoc
 BuildRequires:  aspell
 BuildRequires:  audit-devel
@@ -58,20 +54,23 @@ BuildRequires:  libudev-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  pegtl-devel
+BuildRequires:  pkgconfig
 BuildRequires:  polkit-devel
 #BuildRequires:  spdlog-static
 BuildRequires:  protobuf-devel
+BuildRequires:  pkgconfig(systemd)
+%{?systemd_requires}
 
 %description
 The USBGuard software framework helps to protect your computer against rogue USB
 devices by implementing basic whitelisting/blacklisting capabilities based on
 USB device attributes.
 
-%package -n %lname
+%package -n %{lname}
 Summary:        Library for implementing USB device usage policy
 Group:          System/Libraries
 
-%description -n %lname
+%description -n %{lname}
 The USBGuard software framework helps to protect your computer against rogue USB
 devices by implementing basic whitelisting/blacklisting capabilities based on
 USB device attributes.
@@ -79,7 +78,7 @@ USB device attributes.
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries/C and C++
-Requires:       %lname = %{version}
+Requires:       %{lname} = %{version}
 Requires:       %{name} = %{version}
 Requires:       libstdc++-devel
 Requires:       pkgconfig
@@ -108,7 +107,7 @@ The %{name}-applet-qt package contains an optional Qt 5.x desktop applet
 for interacting with the USBGuard daemon component.
 
 %prep
-%setup -q -n usbguard-%version
+%setup -q -n usbguard-%{version}
 %patch0 -p1
 
 %build
@@ -161,7 +160,6 @@ find %{buildroot} \( -name '*.la' -o -name '*.a' \) -delete
 %postun -n libusbguard0 -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc README.adoc CHANGELOG.md
 %license LICENSE
 %{_sbindir}/usbguard-daemon
@@ -172,35 +170,31 @@ find %{buildroot} \( -name '*.la' -o -name '*.a' \) -delete
 %config(noreplace) %attr(0600,-,-) %{_sysconfdir}/usbguard/usbguard-daemon.conf
 %config(noreplace) %attr(0600,-,-) %{_sysconfdir}/usbguard/rules.conf
 %{_unitdir}/usbguard.service
-%{_datadir}/man/man8/usbguard-daemon.8.gz
+%{_mandir}/man8/usbguard-daemon.8%{?ext_man}
-%{_datadir}/man/man5/usbguard-daemon.conf.5.gz
+%{_mandir}/man5/usbguard-daemon.conf.5%{?ext_man}
-%{_datadir}/man/man5/usbguard-rules.conf.5.gz
+%{_mandir}/man5/usbguard-rules.conf.5%{?ext_man}
 %{_datadir}/bash-completion/completions/usbguard
 %dir %{_datadir}/zsh
 %dir %{_datadir}/zsh/site-functions
 %{_datadir}/zsh/site-functions/_usbguard
 
-%files -n %lname
+%files -n %{lname}
-%defattr(-,root,root,-)
 %license LICENSE
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 %files tools
-%defattr(-,root,root,-)
 %{_bindir}/usbguard
 %{_bindir}/usbguard-rule-parser
-%{_datadir}/man/man1/usbguard.1.gz
+%{_mandir}/man1/usbguard.1%{?ext_man}
 
 %files applet-qt
-%defattr(-,root,root,-)
 %{_bindir}/usbguard-applet-qt
-%{_mandir}/man1/usbguard-applet-qt.1.gz
+%{_mandir}/man1/usbguard-applet-qt.1%{?ext_man}
 %{_datadir}/applications/usbguard-applet-qt.desktop
 %dir %{_datadir}/icons/hicolor
 %dir %{_datadir}/icons/hicolor/scalable