remove test specs from dist and build scripts

diff --git a/Makefile.am b/Makefile.am
index b7edccb7bce4593ea6bdc8c7b413c9ac1b7843f8..eca651a3f44c4d9e9578b4cc79d2425f9669bf81 100644 (file)
--- 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 c5b5aae7da49c258fb44af1c9004eb426eb37384..ce405580077a1f0ce66480f1fcca7addb70b1aad 100755 (executable)
--- 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 5355fe15a6aeace400ef09a53c2a202984b435b3..e69c3cfbb87aac6beae0edf9e42fbb4fce4b4064 100755 (executable)
--- 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 3bb5bbe2c03f200dcf78b71df3177bb9d917ef3a..130ff2cbdd712484bd8d7d27630e0957c2ed2064 100755 (executable)
--- 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