rpm/bind
SHA256
1
0
Fork 0
forked from pool/bind
Code Pull Requests Activity

Accepting request 481339 from home:kukuk:branches:network

Browse Source 
- Add with_systemd define with default off, since we still use init
  scripts and no systemd units.

OBS-URL: https://build.opensuse.org/request/show/481339
OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=207
This commit is contained in:
Marcus Meissner 2017-03-23 16:11:03 +00:00 committed by Git OBS Bridge
parent 44c7103fc2
commit 4e8c935dd7
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bind.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 20 15:02:16 CET 2017 - kukuk@suse.de
- Add with_systemd define with default off, since we still use init
scripts and no systemd units.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Feb 18 17:24:58 UTC 2017 - kukuk@suse.com Sat Feb 18 17:24:58 UTC 2017 - kukuk@suse.com

24
bind.spec
View File

@ -21,6 +21,7 @@ Name: bind
%define pkg_vers 9.10.4-P5 %define pkg_vers 9.10.4-P5
%define rpm_vers 9.10.4P5 %define rpm_vers 9.10.4P5
%define idn_vers 1.0 %define idn_vers 1.0
%define with_systemd 0
Summary: Domain Name System (DNS) Server (named) Summary: Domain Name System (DNS) Server (named)
License: ISC License: ISC
Group: Productivity/Networking/DNS/Servers Group: Productivity/Networking/DNS/Servers
@ -55,7 +56,7 @@ BuildRequires: openldap2-devel
BuildRequires: openssl BuildRequires: openssl
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: python-base BuildRequires: python-base
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 %if %{with_systemd}
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
%else %else
PreReq: %insserv_prereq PreReq: %insserv_prereq
@ -339,6 +340,9 @@ Release: 0
Requires: %{name}-chrootenv Requires: %{name}-chrootenv
Provides: dns_daemon Provides: dns_daemon
Requires(pre): /usr/sbin/groupadd /usr/sbin/useradd Requires(pre): /usr/sbin/groupadd /usr/sbin/useradd
%if !%{with_systemd}
PreReq: %insserv_prereq
%endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230
PreReq: sysvinit(network) sysvinit(syslog) PreReq: sysvinit(network) sysvinit(syslog)
%endif %endif
@ -595,19 +599,19 @@ test -d ${TEMP_DIR} || \
test -e ${TEMP_SYSCONFIG_FILE} && \ test -e ${TEMP_SYSCONFIG_FILE} && \
old ${TEMP_SYSCONFIG_FILE} old ${TEMP_SYSCONFIG_FILE}
echo "NAMED_RUN_CHROOTED=\"${NAMED_RUN_CHROOTED}\"" >${TEMP_SYSCONFIG_FILE} echo "NAMED_RUN_CHROOTED=\"${NAMED_RUN_CHROOTED}\"" >${TEMP_SYSCONFIG_FILE}
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 %if %{with_systemd}
%service_add_pre named.service %service_add_pre named.service
%endif %endif
%preun %preun
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 %if %{with_systemd}
%service_del_preun named.service %service_del_preun named.service
%else %else
%stop_on_removal named %stop_on_removal named
%endif %endif
%post %post
%if 0%{?suse_version} > 0 && 0%{?suse_version} <= 1230 %if !%{with_systemd}
%{fillup_and_insserv -nf named} %{fillup_and_insserv -nf named}
%endif %endif
%{fillup_only -nsa named named} %{fillup_only -nsa named named}
@ -719,7 +723,7 @@ fi # End of 'Add include files to NAMED_CONF_INCLUDE_FILES'
fi # End of 'Are we in update mode?' fi # End of 'Are we in update mode?'
# Remove TEMP_SYSCONFIG_FILE in any case. # Remove TEMP_SYSCONFIG_FILE in any case.
rm -f ${TEMP_SYSCONFIG_FILE} rm -f ${TEMP_SYSCONFIG_FILE}
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 %if %{with_systemd}
%service_add_post named.service %service_add_post named.service
%else %else
NAMED_ACTIVE_FILE="var/adm/named.was.active" NAMED_ACTIVE_FILE="var/adm/named.was.active"
@ -730,7 +734,7 @@ fi
%endif %endif
%postun %postun
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 %if %{with_systemd}
%service_del_postun named.service %service_del_postun named.service
%else %else
%restart_on_update named %restart_on_update named
@ -769,7 +773,7 @@ fi
%pre lwresd %pre lwresd
%{GROUPADD_NAMED} %{GROUPADD_NAMED}
%{USERADD_NAMED} %{USERADD_NAMED}
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 %if %{with_systemd}
%service_add_pre lwresd.service %service_add_pre lwresd.service
%endif %endif
@ -784,7 +788,7 @@ fi
if [ ! -s etc/lwresd.conf ]; then if [ ! -s etc/lwresd.conf ]; then
rm -f etc/lwresd.conf rm -f etc/lwresd.conf
fi fi
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 %if %{with_systemd}
%service_add_post lwresd.service %service_add_post lwresd.service
%else %else
if [ $1 -le 1 ]; then if [ $1 -le 1 ]; then
@ -794,14 +798,14 @@ fi
%preun lwresd %preun lwresd
%stop_on_removal lwresd %stop_on_removal lwresd
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 %if %{with_systemd}
%service_del_preun lwresd.service %service_del_preun lwresd.service
%else %else
%stop_on_removal lwresd %stop_on_removal lwresd
%endif %endif
%postun lwresd %postun lwresd
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 %if %{with_systemd}
%service_del_postun lwresd.service %service_del_postun lwresd.service
%else %else
%restart_on_update lwresd %restart_on_update lwresd