pool/unbound
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 515240 from home:jengelh:branches:server:dns

Browse Source 
- 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
This commit is contained in:
Marguerite Su 2017-08-09 00:28:43 +00:00 committed by Git OBS Bridge
parent 5d8389d694
commit fb979ebd11
4 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libunbound-devel-mini.changes
View File

@ -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 Tue Jun 27 11:13:31 UTC 2017 - michael@stroeder.com

6
libunbound-devel-mini.spec
View File

@ -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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -33,8 +33,8 @@ BuildRequires: flex
BuildRequires: ldns-devel >= %{ldns_version} BuildRequires: ldns-devel >= %{ldns_version}
BuildRequires: libevent-devel BuildRequires: libevent-devel
BuildRequires: libexpat-devel BuildRequires: libexpat-devel
BuildRequires: openssl-devel
BuildRequires: libsodium-devel BuildRequires: libsodium-devel
BuildRequires: openssl-devel
Requires: this-is-only-for-build-envs Requires: this-is-only-for-build-envs
Conflicts: unbound-devel Conflicts: unbound-devel
Conflicts: libunbound2 Conflicts: libunbound2

6
unbound.changes
View File

@ -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 Tue Jun 27 11:13:31 UTC 2017 - michael@stroeder.com

23
unbound.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package unbound # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -62,13 +62,13 @@ BuildRequires: flex
BuildRequires: ldns-devel >= %{ldns_version} BuildRequires: ldns-devel >= %{ldns_version}
BuildRequires: libevent-devel BuildRequires: libevent-devel
BuildRequires: libexpat-devel BuildRequires: libexpat-devel
BuildRequires: libsodium-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: libsodium-devel
%if %{with dnstap} %if %{with dnstap}
BuildRequires: protobuf-c >= 1.0.0
BuildRequires: libprotobuf-c-devel >= 1.0.0
BuildRequires: libfstrm-devel BuildRequires: libfstrm-devel
BuildRequires: libprotobuf-c-devel >= 1.0.0
BuildRequires: protobuf-c >= 1.0.0
%endif %endif
%if %{with python} %if %{with python}
BuildRequires: swig BuildRequires: swig
@ -133,7 +133,7 @@ This package holds the shared library from unbound.
%if %{with_munin} %if %{with_munin}
%package munin %package munin
Summary: Plugin for the munin / munin-node monitoring package Summary: Plugin for the munin / munin-node monitoring package
Group: System Environment/Daemons Group: System/Daemons
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: bc Requires: bc
Requires: munin-node Requires: munin-node
@ -211,8 +211,8 @@ export CXXFLAGS="%{optflags}"
%endif %endif
--with-rootkey-file=%{_sharedstatedir}/unbound/root.key --with-rootkey-file=%{_sharedstatedir}/unbound/root.key
%{__make} %{?_smp_mflags} make %{?_smp_mflags}
%{__make} %{?_smp_mflags} streamtcp make %{?_smp_mflags} streamtcp
%install %install
make install DESTDIR="%{buildroot}" 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 # it currently fails in the ldns unit test. which is weird as both come from the same project
make check ||: make check ||:
%clean
%{__rm} -rf %{buildroot}
%pre anchor %pre anchor
/usr/sbin/groupadd -r unbound >/dev/null 2>&1 || : getent group unbound >/dev/null || groupadd -r unbound
/usr/sbin/useradd -g unbound -s /bin/false -r -c "unbound caching dns server" -d /var/lib/unbound unbound >/dev/null 2>&1 || : getent passwd unbound >/dev/null || \
useradd -g unbound -s /bin/false -r -c "unbound caching DNS server" \
-d /var/lib/unbound unbound
%pre %pre
%if %{with systemd} %if %{with systemd}