From b15431f39b560923c864ca74db83e00aa24dbe58 Mon Sep 17 00:00:00 2001 From: Kees Monshouwer Date: Sat, 8 Feb 2014 13:23:01 +0100 Subject: [PATCH] set filename in testbuild rpms --- build-scripts/redhat/pdns-recursor-test.spec | 4 ++-- build-scripts/redhat/pdns-server-test.spec | 5 ++--- build-scripts/set-version-auth | 2 ++ build-scripts/set-version-recursor | 2 ++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build-scripts/redhat/pdns-recursor-test.spec b/build-scripts/redhat/pdns-recursor-test.spec index dfb4c5fd5..7db9ee313 100644 --- a/build-scripts/redhat/pdns-recursor-test.spec +++ b/build-scripts/redhat/pdns-recursor-test.spec @@ -9,7 +9,7 @@ Release: 1 Epoch: 0 Group: System Environment/Daemons License: GPL -Source: http://downloads.powerdns.com/releases/#FILENAME# +Source: http://downloads.powerdns.com/releases/%{name}-#VERSION#.tar.bz2 BuildRequires: boost-devel >= 1.39.0 BuildRequires: lua-devel >= 5.2 @@ -20,7 +20,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) PowerDNS recursor %prep -%setup -q -n #SOURCE_PATH# +%setup -q -n %{name}-#VERSION# %build %configure diff --git a/build-scripts/redhat/pdns-server-test.spec b/build-scripts/redhat/pdns-server-test.spec index 1fc1eb904..61bb81e01 100644 --- a/build-scripts/redhat/pdns-server-test.spec +++ b/build-scripts/redhat/pdns-server-test.spec @@ -9,8 +9,7 @@ Release: 1 Epoch: 0 License: GPL Group: System/Servers -URL: http://www.powerdns.com/ -Source0: http://downloads.powerdns.com/releases/#FILENAME# +Source: http://downloads.powerdns.com/releases/pdns-#VERSION#.tar.gz BuildRequires: autoconf automake BuildRequires: gcc gcc-c++ @@ -30,7 +29,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root PowerDNS testbuild %prep -%setup -q -n #SOURCE_PATH# +%setup -q -n pdns-#VERSION# %build %configure \ diff --git a/build-scripts/set-version-auth b/build-scripts/set-version-auth index e21e2ae04..25f9cd03e 100755 --- a/build-scripts/set-version-auth +++ b/build-scripts/set-version-auth @@ -10,3 +10,5 @@ sed -r "s/Version: (.*)/Version: $RPM_VERSION/" -i pdns.spec sed -r "s/AC_INIT\(\[pdns\],(.*)/AC_INIT([pdns], [$VERSION])/" -i configure.ac sed -r "s/^(.*)AC_SUBST\(\[DIST_HOST\],(.*)/AC_SUBST([DIST_HOST], [$DIST_HOST])/" -i configure.ac sed -r "1 s/^pdns \\(([^)]*)-([0-9.])\\)/pdns \\($DEB_VERSION-\\2\\)/" -i debian-pdns/changelog + +sed -r "s/#VERSION#/$VERSION/" -i build-scripts/redhat/pdns-server-test.spec diff --git a/build-scripts/set-version-recursor b/build-scripts/set-version-recursor index 36cb744d4..621e04896 100755 --- a/build-scripts/set-version-recursor +++ b/build-scripts/set-version-recursor @@ -9,3 +9,5 @@ DIST_HOST="$(id -u -n)@$(hostname -f)" sed -r "s/^VERSION=(.*)/VERSION=$VERSION/" -i pdns/dist-recursor sed -r "s/^DIST_HOST=(.*)/DIST_HOST=$DIST_HOST/" -i pdns/dist-recursor sed -r "s/Version: (.*)/Version: $RPM_VERSION/" -i pdns/pdns-recursor.spec + +sed -r "s/#VERSION#/$VERSION/" -i build-scripts/redhat/pdns-recursor-test.spec -- 2.49.0