From fb979ebd1144f3ba8bda46ab46914b894165a4a419a17d2c8ab02b716a0bc685 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Wed, 9 Aug 2017 00:28:43 +0000 Subject: [PATCH] Accepting request 515240 from home:jengelh:branches:server:dns - RPM group fix. Do not suppress user/group creation problems. Replace %__ type macro indirections. OBS-URL: https://build.opensuse.org/request/show/515240 OBS-URL: https://build.opensuse.org/package/show/server:dns/unbound?expand=0&rev=60 --- libunbound-devel-mini.changes | 6 ++++++ libunbound-devel-mini.spec | 6 +++--- unbound.changes | 6 ++++++ unbound.spec | 23 +++++++++++------------ 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/libunbound-devel-mini.changes b/libunbound-devel-mini.changes index d4dc620..4664629 100644 --- a/libunbound-devel-mini.changes +++ b/libunbound-devel-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 8 19:02:38 UTC 2017 - jengelh@inai.de + +- RPM group fix. Do not suppress user/group creation problems. + Replace %__ type macro indirections. + ------------------------------------------------------------------- Tue Jun 27 11:13:31 UTC 2017 - michael@stroeder.com diff --git a/libunbound-devel-mini.spec b/libunbound-devel-mini.spec index 8be5429..3fee9a2 100644 --- a/libunbound-devel-mini.spec +++ b/libunbound-devel-mini.spec @@ -1,7 +1,7 @@ # -# spec file for package libunbound +# spec file for package libunbound-devel-mini # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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,8 @@ BuildRequires: flex BuildRequires: ldns-devel >= %{ldns_version} BuildRequires: libevent-devel BuildRequires: libexpat-devel -BuildRequires: openssl-devel BuildRequires: libsodium-devel +BuildRequires: openssl-devel Requires: this-is-only-for-build-envs Conflicts: unbound-devel Conflicts: libunbound2 diff --git a/unbound.changes b/unbound.changes index d4dc620..4664629 100644 --- a/unbound.changes +++ b/unbound.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 8 19:02:38 UTC 2017 - jengelh@inai.de + +- RPM group fix. Do not suppress user/group creation problems. + Replace %__ type macro indirections. + ------------------------------------------------------------------- Tue Jun 27 11:13:31 UTC 2017 - michael@stroeder.com diff --git a/unbound.spec b/unbound.spec index 8eb886e..d729fc4 100644 --- a/unbound.spec +++ b/unbound.spec @@ -1,7 +1,7 @@ # # spec file for package unbound # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -62,13 +62,13 @@ BuildRequires: flex BuildRequires: ldns-devel >= %{ldns_version} BuildRequires: libevent-devel BuildRequires: libexpat-devel +BuildRequires: libsodium-devel BuildRequires: openssl-devel BuildRequires: python-devel -BuildRequires: libsodium-devel %if %{with dnstap} -BuildRequires: protobuf-c >= 1.0.0 -BuildRequires: libprotobuf-c-devel >= 1.0.0 BuildRequires: libfstrm-devel +BuildRequires: libprotobuf-c-devel >= 1.0.0 +BuildRequires: protobuf-c >= 1.0.0 %endif %if %{with python} BuildRequires: swig @@ -133,7 +133,7 @@ This package holds the shared library from unbound. %if %{with_munin} %package munin Summary: Plugin for the munin / munin-node monitoring package -Group: System Environment/Daemons +Group: System/Daemons Requires: %{name} = %{version} Requires: bc Requires: munin-node @@ -211,8 +211,8 @@ export CXXFLAGS="%{optflags}" %endif --with-rootkey-file=%{_sharedstatedir}/unbound/root.key -%{__make} %{?_smp_mflags} -%{__make} %{?_smp_mflags} streamtcp +make %{?_smp_mflags} +make %{?_smp_mflags} streamtcp %install make install DESTDIR="%{buildroot}" @@ -287,12 +287,11 @@ echo ".so man8/unbound-control.8" > %{buildroot}/%{_mandir}/man8/unbound-control # it currently fails in the ldns unit test. which is weird as both come from the same project make check ||: -%clean -%{__rm} -rf %{buildroot} - %pre anchor -/usr/sbin/groupadd -r unbound >/dev/null 2>&1 || : -/usr/sbin/useradd -g unbound -s /bin/false -r -c "unbound caching dns server" -d /var/lib/unbound unbound >/dev/null 2>&1 || : +getent group unbound >/dev/null || groupadd -r unbound +getent passwd unbound >/dev/null || \ + useradd -g unbound -s /bin/false -r -c "unbound caching DNS server" \ + -d /var/lib/unbound unbound %pre %if %{with systemd}