Update to the latest pdns-builder

diff --git a/builder b/builder
index c218fa2c8b028d46e635fffb6d474e4ddcf375c6..781eaa25e0308557226e127e3385e2118a4db2f7 160000 (submodule)
--- a/builder
+++ b/builder
@@ -1 +1 @@
-Subproject commit c218fa2c8b028d46e635fffb6d474e4ddcf375c6
+Subproject commit 781eaa25e0308557226e127e3385e2118a4db2f7

diff --git a/builder-support/specs/dnsdist.spec b/builder-support/specs/dnsdist.spec
index 195fbff9bb74b5b2cb9d594013ce7ab74c0efaae..885e81c2b21499dbc994121a1cfbe5dae06f4023 100644 (file)
--- a/builder-support/specs/dnsdist.spec
+++ b/builder-support/specs/dnsdist.spec
@@ -1,11 +1,11 @@
 Name: dnsdist
-Version: %{getenv:BUILDER_VERSION}
-Release: %{getenv:BUILDER_RELEASE}
+Version: %{getenv:BUILDER_RPM_VERSION}
+Release: %{getenv:BUILDER_RPM_RELEASE}%{dist}
 Summary: Powerful and scriptable DNS loadbalancer
 License: GPLv2
 Vendor: PowerDNS.COM BV
 Group: System/DNS
-Source: dnsdist-%{version}.tar.bz2
+Source: %{name}-%{getenv:BUILDER_VERSION}.tar.bz2
 BuildRequires: readline-devel
 BuildRequires: libedit-devel
 BuildRequires: openssl-devel
@@ -53,7 +53,11 @@ BuildRequires: fstrm-devel
 dnsdist is a high-performance DNS loadbalancer that is scriptable in Lua.
 
 %prep
-%setup
+%if 0%{?rhel} == 6
+%setup -n %{name}-%{getenv:BUILDER_VERSION}
+%else
+%autosetup -p1 -n %{name}-%{getenv:BUILDER_VERSION}
+%endif
 
 # run as dnsdist user
 sed -i '/^ExecStart/ s/dnsdist/dnsdist -u dnsdist -g dnsdist/' dnsdist.service.in

diff --git a/builder-support/specs/pdns-recursor.spec b/builder-support/specs/pdns-recursor.spec
index 2542e81ba36b4e155e020e718e1e24780316ec4b..0ef7b61039099f53005300fa725e5eec0116003a 100644 (file)
--- a/builder-support/specs/pdns-recursor.spec
+++ b/builder-support/specs/pdns-recursor.spec
@@ -1,11 +1,11 @@
 Name: pdns-recursor
-Version: %{getenv:BUILDER_VERSION}
-Release: %{getenv:BUILDER_RELEASE}%{?dist}
+Version: %{getenv:BUILDER_RPM_VERSION}
+Release: %{getenv:BUILDER_RPM_RELEASE}%{?dist}
 Summary: Modern, advanced and high performance recursing/non authoritative name server
 Group: System Environment/Daemons
 License: GPLv2
 URL: https://powerdns.com
-Source0: %{name}-%{version}.tar.bz2
+Source0: %{name}-%{getenv:BUILDER_VERSION}.tar.bz2
 %if 0%{?rhel} == 6
 Source1: pdns-recursor.init
 %endif
@@ -49,9 +49,9 @@ package if you need a dns cache for your network.
 
 %prep
 %if 0%{?rhel} == 6
-%setup -q -n %{name}-%{version}
+%setup -n %{name}-%{getenv:BUILDER_VERSION}
 %else
-%autosetup -p1
+%autosetup -p1 -n %{name}-%{getenv:BUILDER_VERSION} 
 %endif
 
 %build

diff --git a/builder-support/specs/pdns.spec b/builder-support/specs/pdns.spec
index 6a12122c5c919f3ec830923f612dda9ccf88a355..ca7d72c6cc6c9878182fe80990a40a036723c28b 100644 (file)
--- a/builder-support/specs/pdns.spec
+++ b/builder-support/specs/pdns.spec
@@ -7,13 +7,13 @@ exit 1
 %global backends %{nil}
 
 Name: pdns
-Version: %{getenv:BUILDER_VERSION}
-Release: %{getenv:BUILDER_RELEASE}%{dist}
+Version: %{getenv:BUILDER_RPM_VERSION}
+Release: %{getenv:BUILDER_RPM_RELEASE}%{dist}
 Summary: A modern, advanced and high performance authoritative-only nameserver
 Group: System Environment/Daemons
 License: GPLv2
 URL: https://powerdns.com
-Source0: %{name}-%{version}.tar.bz2
+Source0: %{name}-%{getenv:BUILDER_VERSION}.tar.bz2
 %if 0%{?rhel} < 7
 Source1: pdns.init
 %endif
@@ -175,7 +175,11 @@ This package contains the TinyDNS backend for %{name}
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}
+%if 0%{?rhel} == 6
+%setup -n %{name}-%{getenv:BUILDER_VERSION}
+%else
+%autosetup -p1 -n %{name}-%{getenv:BUILDER_VERSION} 
+%endif
 
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED"