Accepting request 661852 from home:jengelh:branches:server:dns
- Reorder scriptlet %if guards so that no empty scriptlets are emitted. Add one missing %if %{with systemd}. - Replace %__-type macro indirections. OBS-URL: https://build.opensuse.org/request/show/661852 OBS-URL: https://build.opensuse.org/package/show/server:dns/unbound?expand=0&rev=96
This commit is contained in:
parent
47ec6e5b44
commit
e06e1c64ed
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 28 17:16:01 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Reorder scriptlet %if guards so that no empty scriptlets are
|
||||
emitted. Add one missing %if %{with systemd}.
|
||||
- Replace %__-type macro indirections.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 11 19:59:00 UTC 2018 - Michael Ströder <michael@stroeder.com>
|
||||
|
||||
|
@ -89,10 +89,10 @@ export CXXFLAGS="%{optflags}"
|
||||
--with-libunbound-only \
|
||||
--with-rootkey-file=%{_sharedstatedir}/unbound/root.key
|
||||
|
||||
%{__make} %{?_smp_mflags}
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make install DESTDIR="%{buildroot}"
|
||||
%make_install
|
||||
rm -rf %{buildroot}%{_mandir} %{buildroot}%{_libdir}/*.la
|
||||
|
||||
%check
|
||||
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 28 17:16:01 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Reorder scriptlet %if guards so that no empty scriptlets are
|
||||
emitted. Add one missing %if %{with systemd}.
|
||||
- Replace %__-type macro indirections.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 11 19:59:00 UTC 2018 - Michael Ströder <michael@stroeder.com>
|
||||
|
||||
|
13
unbound.spec
13
unbound.spec
@ -225,11 +225,10 @@ export CXXFLAGS="%{optflags}"
|
||||
%endif
|
||||
--with-rootkey-file=%{_sharedstatedir}/unbound/root.key
|
||||
|
||||
make %{?_smp_mflags}
|
||||
make %{?_smp_mflags} streamtcp
|
||||
make %{?_smp_mflags} all streamtcp
|
||||
|
||||
%install
|
||||
make install DESTDIR="%{buildroot}"
|
||||
%make_install
|
||||
install -d -m 0750 %{buildroot}/var/lib/unbound
|
||||
install -d 0755 %{buildroot}%{_unitdir}
|
||||
install -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/unbound.service
|
||||
@ -306,19 +305,21 @@ echo ".so man8/unbound-control.8" > %{buildroot}/%{_mandir}/man8/unbound-control
|
||||
make check ||:
|
||||
|
||||
%pre anchor
|
||||
%if %{with systemd}
|
||||
%service_add_pre unbound-anchor.service unbound-anchor.timer
|
||||
%endif
|
||||
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}
|
||||
%pre
|
||||
%service_add_pre unbound-keygen.service unbound.service
|
||||
%endif
|
||||
|
||||
%post anchor
|
||||
%if %{with systemd}
|
||||
%post anchor
|
||||
%service_add_post unbound-anchor.service unbound-anchor.timer
|
||||
%endif
|
||||
|
||||
@ -329,8 +330,8 @@ systemd-tmpfiles --create %{_tmpfilesdir}/unbound.conf || :
|
||||
%service_add_post unbound-keygen.service unbound.service
|
||||
%endif
|
||||
|
||||
%preun anchor
|
||||
%if %{with systemd}
|
||||
%preun anchor
|
||||
%service_del_preun unbound-anchor.service unbound-anchor.timer
|
||||
%endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user