From 9927c8db294bef848ed2ac83ed29030b168631e25f8c3f4d70b8ddd3f676f3ca Mon Sep 17 00:00:00 2001
From: Reinhard Max <max@suse.com>
Date: Thu, 8 May 2014 09:51:15 +0000
Subject: [PATCH 1/2] 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
---
 bind.changes                    |  5 +++++
 bind.spec                       | 11 +++++++++--
 workaround-compile-problem.diff | 13 -------------
 3 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 workaround-compile-problem.diff

diff --git a/bind.changes b/bind.changes
index 8e9bdba..d439abc 100644
--- a/bind.changes
+++ b/bind.changes
@@ -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
 
diff --git a/bind.spec b/bind.spec
index 46cca22..646198f 100644
--- a/bind.spec
+++ b/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
 
diff --git a/workaround-compile-problem.diff b/workaround-compile-problem.diff
deleted file mode 100644
index 7b93547..0000000
--- a/workaround-compile-problem.diff
+++ /dev/null
@@ -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@

From 8dac1c49a41b40c2fe348f15b023630c9cb67b9f997fd6fd17ddf10d5bf40e49 Mon Sep 17 00:00:00 2001
From: Reinhard Max <max@suse.com>
Date: Thu, 8 May 2014 10:01:10 +0000
Subject: [PATCH 2/2] Re-sync changes file with SLE12.

OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=139
---
 bind.changes | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bind.changes b/bind.changes
index d439abc..41ff163 100644
--- a/bind.changes
+++ b/bind.changes
@@ -3,6 +3,11 @@ Thu May  8 11:23:47 CEST 2014 - ro@suse.de
 
 - use %_rundir macro 
 
+-------------------------------------------------------------------
+Fri Mar 28 20:49:57 CET 2014 - lchiquitto@suse.de
+
+- Remove obsolete patch "workaround-compile-problem.diff"
+
 -------------------------------------------------------------------
 Fri Jan 24 10:12:56 UTC 2014 - max@suse.com