From 78bf8e7c8a2684428c8a2c05daf5293da95018b84975b060a07d1ff77d05d84b Mon Sep 17 00:00:00 2001 From: Mark Post Date: Thu, 29 Nov 2018 23:15:22 +0000 Subject: [PATCH] Accepting request 652747 from home:markkp:branches:security Misc changes OBS-URL: https://build.opensuse.org/request/show/652747 OBS-URL: https://build.opensuse.org/package/show/security/openCryptoki?expand=0&rev=82 --- openCryptoki.changes | 1 + openCryptoki.spec | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/openCryptoki.changes b/openCryptoki.changes index f75c1d5..73145a7 100644 --- a/openCryptoki.changes +++ b/openCryptoki.changes @@ -7,6 +7,7 @@ Thu Nov 29 22:45:36 UTC 2018 - mpost@suse.com - Update the summary for the -devel package. - Changed several PreReq entries to Requires(pre) as a result of the output from spec-cleaner. Removed a couple of obsolete lines. +- Removed obsolete check for whether systemd is in use or not. ------------------------------------------------------------------- Fri Nov 16 15:00:52 UTC 2018 - mpost@suse.com diff --git a/openCryptoki.spec b/openCryptoki.spec index 4ad522e..199914a 100644 --- a/openCryptoki.spec +++ b/openCryptoki.spec @@ -25,12 +25,6 @@ %define pkcs11_group_id 64 %define oc_cvs_tag opencryptoki -%if 0%{?suse_version} > 1220 -%define uses_systemd 1 -%else -%define uses_systemd 0 -%endif - Name: openCryptoki Version: 3.11.0 Release: 0 @@ -57,6 +51,7 @@ BuildRequires: pkgconfig BuildRequires: pwdutils BuildRequires: trousers-devel BuildRequires: pkgconfig(systemd) +Requires(pre): %{_bindir}/getent Requires(pre): %{_sbindir}/groupadd Requires(pre): %{_sbindir}/usermod