From 92849c1fcb289a798894971628bf39d7a45d6607 Mon Sep 17 00:00:00 2001 From: Kees Monshouwer Date: Mon, 24 Aug 2015 20:32:44 +0200 Subject: [PATCH] remove test specs from dist and build scripts --- Makefile.am | 1 - build-scripts/dist-recursor | 2 -- build-scripts/set-version-auth | 2 -- build-scripts/set-version-recursor | 2 -- 4 files changed, 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index b7edccb7bc..eca651a3f4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,6 @@ EXTRA_DIST = \ README \ .version \ build-aux/gen-version \ - build-scripts/redhat/pdns-server-test.spec \ build-scripts/semistaticg++ \ codedocs/doxygen.conf \ contrib/powerdns.solaris.init.d \ diff --git a/build-scripts/dist-recursor b/build-scripts/dist-recursor index c5b5aae7da..ce40558007 100755 --- a/build-scripts/dist-recursor +++ b/build-scripts/dist-recursor @@ -80,9 +80,7 @@ cp configure-recursor $DIRNAME/configure cp powerdns-example-script.lua $DIRNAME mkdir -p $DIRNAME/contrib cp ../contrib/systemd-pdns-recursor.service $DIRNAME/contrib -mkdir -p $DIRNAME/build-scripts/redhat cp ../build-scripts/build-recursor-semistatic $DIRNAME/build-scripts -cp ../build-scripts/redhat/pdns-recursor-test.spec $DIRNAME/build-scripts/redhat cp pdns-recursor.spec $DIRNAME mkdir -p $DIRNAME/sysdeps diff --git a/build-scripts/set-version-auth b/build-scripts/set-version-auth index 5355fe15a6..e69c3cfbb8 100755 --- a/build-scripts/set-version-auth +++ b/build-scripts/set-version-auth @@ -10,5 +10,3 @@ 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/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 3bb5bbe2c0..130ff2cbdd 100755 --- a/build-scripts/set-version-recursor +++ b/build-scripts/set-version-recursor @@ -12,5 +12,3 @@ DIST_HOST="$(id -u -n)@$(hostname -f 2>/dev/null || hostname 2>/dev/null || echo 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.47.2