rpm/usbguard
SHA256
1
0
Fork 0
forked from pool/usbguard
Code Pull Requests Activity

Accepting request 666303 from home:rfrohl:branches:hardware

Browse Source 
use upstream usbguard.service instead of hardcoded version (bsc#1120969)

OBS-URL: https://build.opensuse.org/request/show/666303
OBS-URL: https://build.opensuse.org/package/show/hardware/usbguard?expand=0&rev=12
This commit is contained in:
Marcus Meissner 2019-01-15 17:02:02 +00:00 committed by Git OBS Bridge
parent 8560fbf779
commit 4dcea42899
3 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usbguard.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jan 15 16:28:33 UTC 2019 - Robert Frohl <rfrohl@suse.com>
- use upstream usbguard.service instead of hardcoded version (bsc#1120969)
-------------------------------------------------------------------
Wed Nov 7 17:38:38 UTC 2018 - Jan Engelhardt <jengelh@inai.de>

11
usbguard.service
View File

@ -1,11 +0,0 @@
[Unit]
Description=USBGuard daemon
Wants=systemd-udevd.service local-fs.target
[Service]
Type=simple
ExecStart=/usr/sbin/usbguard-daemon -k -c /etc/usbguard/usbguard-daemon.conf
Restart=on-failure
[Install]
WantedBy=base.target

11
usbguard.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package usbguard
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 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
@ -33,8 +33,7 @@ Source0: https://github.com/USBGuard/usbguard/releases/download/usbguard-
Source1: https://github.com/USBGuard/usbguard/releases/download/usbguard-%{version}/usbguard-%{version}.tar.gz.sig
Source2: usbguard.keyring
Source3: usbguard-daemon.conf
Source4: usbguard.service
Source5: usbguard-rpmlintrc
Source4: usbguard-rpmlintrc
Patch0: usbguard-applet-qt_desktop_menu_categories.patch
%{?systemd_requires}
@ -111,8 +110,6 @@ for interacting with the USBGuard daemon component.
%prep
%setup -q -n usbguard-%version
%patch0 -p1
# Remove bundled library sources before build
#rm -rf src/ThirdParty/{Catch,PEGTL}
%build
mkdir -p ./m4
@ -141,10 +138,6 @@ ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rcusbguard
mkdir -p %{buildroot}%{_sysconfdir}/usbguard
install -p -m 600 %{SOURCE3} %{buildroot}%{_sysconfdir}/usbguard/usbguard-daemon.conf
# Install systemd unit
mkdir -p %{buildroot}%{_unitdir}
install -p -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/usbguard.service
# zsh completion, currently needs manual intervention
mkdir -p %{buildroot}%{_datadir}/zsh/site-functions/
install -p -m 644 scripts/usbguard-zsh-completion %{buildroot}%{_datadir}/zsh/site-functions/_usbguard