Accepting request 233009 from home:oertel:branches:network
- use %_rundir macro OBS-URL: https://build.opensuse.org/request/show/233009 OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=138
This commit is contained in:
parent
f40daf517b
commit
9927c8db29
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu May 8 11:23:47 CEST 2014 - ro@suse.de
|
||||
|
||||
- use %_rundir macro
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 24 10:12:56 UTC 2014 - max@suse.com
|
||||
|
||||
|
11
bind.spec
11
bind.spec
@ -91,6 +91,9 @@ Source60: dlz-schema.txt
|
||||
%define USERADD_NAMED /usr/sbin/useradd -r -o -g %{NAMED_GID_NAME} -u %{NAMED_UID} -s %{NAMED_SHELL} -c "%{NAMED_COMMENT}" -d %{NAMED_HOMEDIR} %{NAMED_UID_NAME} 2> /dev/null || :
|
||||
%define USERMOD_NAMED /usr/sbin/usermod -s %{NAMED_SHELL} -d %{NAMED_HOMEDIR} %{NAMED_UID_NAME} 2>/dev/null || :
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if ! %{defined _rundir}
|
||||
%define _rundir %{_localstatedir}/run
|
||||
%endif
|
||||
|
||||
%description
|
||||
Berkeley Internet Name Domain (BIND) is an implementation of the Domain
|
||||
@ -318,7 +321,7 @@ mkdir -p \
|
||||
${RPM_BUILD_ROOT}/var/lib/named/{etc/named.d,dev,dyn,log,master,slave,var/{lib,run/named}} \
|
||||
${RPM_BUILD_ROOT}%{_mandir}/{man1,man3,man5,man8} \
|
||||
${RPM_BUILD_ROOT}/var/adm/fillup-templates \
|
||||
${RPM_BUILD_ROOT}/var/run \
|
||||
${RPM_BUILD_ROOT}/%{_rundir} \
|
||||
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
|
||||
%{__make} DESTDIR=${RPM_BUILD_ROOT} install
|
||||
pushd contrib/idn/idnkit-1.0-src
|
||||
@ -351,7 +354,11 @@ touch ${RPM_BUILD_ROOT}/var/lib/named/etc/{localtime,named.conf.include,named.d/
|
||||
touch ${RPM_BUILD_ROOT}/var/lib/named/dev/log
|
||||
ln -s ../.. ${RPM_BUILD_ROOT}/var/lib/named/var/lib/named
|
||||
ln -s ../log ${RPM_BUILD_ROOT}/var/lib/named/var
|
||||
%if "%_rundir" == "/run"
|
||||
ln -s ../var/lib/named/var/run/named ${RPM_BUILD_ROOT}/run
|
||||
%else
|
||||
ln -s ../lib/named/var/run/named ${RPM_BUILD_ROOT}/var/run
|
||||
%endif
|
||||
for file in named-common named-named syslog-named; do
|
||||
install -m 0644 vendor-files/sysconfig/${file} ${RPM_BUILD_ROOT}/var/adm/fillup-templates/sysconfig.${file}
|
||||
done
|
||||
@ -623,7 +630,7 @@ fi
|
||||
%attr(0666, root, root) %dev(c, 1, 8) %{_var}/lib/named/dev/random
|
||||
%{_var}/lib/named/var/lib/named
|
||||
%{_var}/lib/named/var/log
|
||||
%ghost %{_var}/run/named
|
||||
%ghost %{_rundir}/named
|
||||
%{_var}/adm/fillup-templates/sysconfig.named-common
|
||||
%{_var}/adm/fillup-templates/sysconfig.syslog-named
|
||||
|
||||
|
@ -1,13 +0,0 @@
|
||||
Index: bin/tests/system/Makefile.in
|
||||
===================================================================
|
||||
--- bin/tests/system/Makefile.in.orig
|
||||
+++ bin/tests/system/Makefile.in
|
||||
@@ -21,7 +21,7 @@ top_srcdir = @top_srcdir@
|
||||
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
-SUBDIRS = dlzexternal filter-aaaa lwresd rpz rsabigexponent tkey tsiggss
|
||||
+SUBDIRS = filter-aaaa lwresd rpz rsabigexponent tkey tsiggss
|
||||
TARGETS =
|
||||
|
||||
@BIND9_MAKE_RULES@
|
Loading…
Reference in New Issue
Block a user