From ffda523b4acd5048c1c59c505221dfb8049130e9955ce22afa35c9f670f7bc5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 21 Mar 2019 11:31:36 +0000 Subject: [PATCH] Accepting request 687289 from home:jengelh:sct - Reduce scriptlets' hard dependency on systemd. - Replace some UUOC by find -exec. - Make %install POSIX sh compatible. OBS-URL: https://build.opensuse.org/request/show/687289 OBS-URL: https://build.opensuse.org/package/show/security/argus?expand=0&rev=24 --- argus.changes | 7 +++++++ argus.spec | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/argus.changes b/argus.changes index f605688..faaf91b 100644 --- a/argus.changes +++ b/argus.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Mar 21 10:43:52 UTC 2019 - Jan Engelhardt + +- Reduce scriptlets' hard dependency on systemd. +- Replace some UUOC by find -exec. +- Make %install POSIX sh compatible. + ------------------------------------------------------------------- Thu Oct 26 11:06:37 UTC 2017 - dimstar@opensuse.org diff --git a/argus.spec b/argus.spec index 2a5b28b..a229ac5 100644 --- a/argus.spec +++ b/argus.spec @@ -1,7 +1,7 @@ # # spec file for package argus # -# Copyright (c) 2016 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,7 +20,7 @@ Name: argus Version: 3.0.8.2 Release: 0 Summary: Network Monitoring Tool -License: GPL-2.0 and LGPL-2.1 and BSD-3-Clause and MIT +License: GPL-2.0-only AND LGPL-2.1-only AND BSD-3-Clause AND MIT Group: Productivity/Networking/Diagnostic Url: http://www.qosient.com/argus/ Source: http://qosient.com/argus/src/%{name}-%{version}.tar.gz @@ -44,7 +44,7 @@ Summary: Daemon for Network Monitoring Tool Group: Productivity/Networking/Diagnostic Requires: argus Provides: argus:%{_sbindir}/argus -%{?systemd_requires} +%{?systemd_ordering} %description Argus is a network monitoring tool. @@ -67,7 +67,7 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" make %{?_smp_mflags} %install -install -d -m 755 $RPM_BUILD_ROOT{/etc,%{_prefix}/{sbin,bin,share/man},%{_docdir}} +mkdir -p %{buildroot}/etc %{buildroot}/%{_sbindir} %{buildroot}/%{_bindir} %{buildroot}/%{_mandir} %{buildroot}/%{_docdir} install -m 700 bin/argus %{buildroot}%{_sbindir}/argus install -m 700 bin/arg* %{buildroot}%{_bindir}/ install -D -m 0644 %{SOURCE5} %{buildroot}/%{_unitdir}/argus.service @@ -78,10 +78,10 @@ rm -f %{buildroot}%{_bindir}/argus_linux cp -a man* %{buildroot}%{_mandir} chmod a-x %{buildroot}%{_mandir}/*/* ) rm -f %{buildroot}%{_mandir}/man1/tcpdump.1* -rm -rf `find -type f -name ._*` +find -type f -name ._* -exec rm -Rf {} + install -m 600 support/Config/argus.conf %{buildroot}%{_sysconfdir}/argus.conf install -m 755 support/Archive/argusarchive %{buildroot}%{_bindir}/ -find support -type f -exec chmod 0644 {} \; +find support -type f -exec chmod 0644 {} + #chmod a+x support/{Archive/argusarchive,Startup/argus,System/magic} chmod a+x support/{Archive/argusarchive,Startup/argus}