From 43ba3368ef1d80b9a6f295899375b9103a856db2aa16579ccb16e4cf9e1e0fad Mon Sep 17 00:00:00 2001
From: Andrey Karepin <egdfree@opensuse.org>
Date: Sun, 11 Jan 2015 16:14:25 +0000
Subject: [PATCH] Accepting request 266520 from home:jengelh:branches:network

- Explicitly BuildRequire systemd-rpm-macros since it is used
  for lwresd %post etc. Then drop pre-12.x material.
  Remove configure.in.diff2.

OBS-URL: https://build.opensuse.org/request/show/266520
OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=160
---
 bind.changes       |  7 +++++++
 bind.spec          | 20 +-------------------
 configure.in.diff2 | 11 -----------
 3 files changed, 8 insertions(+), 30 deletions(-)
 delete mode 100644 configure.in.diff2

diff --git a/bind.changes b/bind.changes
index 62b6448..e24b1fb 100644
--- a/bind.changes
+++ b/bind.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Dec 12 02:28:36 UTC 2014 - jengelh@inai.de
+
+- Explicitly BuildRequire systemd-rpm-macros since it is used
+  for lwresd %post etc. Then drop pre-12.x material.
+  Remove configure.in.diff2.
+
 -------------------------------------------------------------------
 Thu Dec 11 13:03:30 UTC 2014 - jengelh@inai.de
 
diff --git a/bind.spec b/bind.spec
index a87ce6d..c935cc5 100644
--- a/bind.spec
+++ b/bind.spec
@@ -41,7 +41,6 @@ Patch4:         perl-path.diff
 Patch51:        pie_compile.diff
 Patch52:        named-bootconf.diff
 Patch53:        bind-sdb-ldap.patch
-Patch100:       configure.in.diff2
 Patch101:       runidn.diff
 BuildRequires:  krb5-devel
 BuildRequires:  libcap
@@ -53,6 +52,7 @@ BuildRequires:  openldap2-devel
 BuildRequires:  openssl
 BuildRequires:  openssl-devel
 BuildRequires:  python-base
+BuildRequires:  systemd-rpm-macros
 BuildRequires:  update-desktop-files
 Provides:       bind8
 Provides:       bind9
@@ -66,15 +66,11 @@ Requires(pre):  /usr/sbin/groupadd /usr/sbin/useradd /usr/sbin/usermod
 Url:            http://isc.org/sw/bind/
 
 Source60:       dlz-schema.txt
-%if %ul_version >= 1
-%define	VENDOR UL
-%else
 %if "%{_vendor}" == "suse"
 %define	VENDOR SUSE 
 %else
 %define	VENDOR %_vendor
 %endif
-%endif
 # Defines for user and group add
 %define	NAMED_UID 44
 %define	NAMED_UID_NAME named
@@ -319,9 +315,7 @@ Summary:        BIND documentation
 Group:          Documentation/Other
 Version:        %rpm_vers
 Release:        0
-%if 0%{?suse_version} >= 1120
 BuildArch:      noarch
-%endif
 
 %description doc
 Documentation of the Berkeley Internet Name Domain (BIND) Domain Name
@@ -336,9 +330,7 @@ Release:        0
 Requires:       %{name}-chrootenv
 Provides:       dns_daemon
 Requires(pre):  /usr/sbin/groupadd /usr/sbin/useradd
-%if %suse_version > 1131
 PreReq:         sysvinit(network) sysvinit(syslog)
-%endif
 
 %description lwresd
 Bind-lwresd provides resolution services to local clients using a
@@ -372,14 +364,9 @@ Name Domain (BIND) DNS server is found in the package named bind.
 %patch1 -p1
 %patch4 -p0
 #%patch50
-%if 0%{?suse_version} >= 1000
 %patch51
-%endif
 %patch52
 %patch53
-%if 0%{?suse_version} <= 1010
-%patch100 -p1
-%endif
 %patch101 -p1
 # modify settings of some files regarding to OS version and vendor
 function replaceStrings()
@@ -493,7 +480,6 @@ mkdir -p \
 %{__make} DESTDIR=${RPM_BUILD_ROOT} install
 pushd contrib/idn/idnkit-1.0-src
 %{__make} DESTDIR=${RPM_BUILD_ROOT} install
-popd
 # remove useless .la files
 rm -f ${RPM_BUILD_ROOT}/%{_lib}/libidnkit.la
 rm -f ${RPM_BUILD_ROOT}/%{_lib}/libidnkitlite.la
@@ -940,10 +926,8 @@ fi
 %{_bindir}/genDDNSkey
 %{_sbindir}/arpaname
 %{_sbindir}/ddns-confgen
-%if 0%{?suse_version} > 1110
 %{_sbindir}/dnssec-checkds
 %{_sbindir}/dnssec-coverage
-%endif
 %{_sbindir}/dnssec-dsfromkey
 %{_sbindir}/dnssec-importkey
 %{_sbindir}/dnssec-keyfromlabel
@@ -970,10 +954,8 @@ fi
 %{_mandir}/man1/nsupdate.1.gz
 %{_mandir}/man5/rndc.conf.5.gz
 %{_mandir}/man8/ddns-confgen.8.gz
-%if 0%{?suse_version} > 1110
 %{_mandir}/man8/dnssec-checkds.8.gz
 %{_mandir}/man8/dnssec-coverage.8.gz
-%endif
 %{_mandir}/man8/dnssec-dsfromkey.8.gz
 %{_mandir}/man8/dnssec-importkey.8.gz
 %{_mandir}/man8/dnssec-keyfromlabel.8.gz
diff --git a/configure.in.diff2 b/configure.in.diff2
deleted file mode 100644
index a05b830..0000000
--- a/configure.in.diff2
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in
-+++ a/configure.in	2011/04/21 13:34:11
-@@ -280,7 +280,7 @@
- AC_C_INLINE
- AC_C_VOLATILE
- AC_CHECK_FUNC(sysctlbyname, AC_DEFINE(HAVE_SYSCTLBYNAME))
--AC_C_FLEXIBLE_ARRAY_MEMBER
-+#AC_C_FLEXIBLE_ARRAY_MEMBER
- 
- #
- # UnixWare 7.1.1 with the feature supplement to the UDK compiler