scripts: add script to modify spec file

diff --git a/scripts/make-archive.sh b/scripts/make-archive.sh
index f8fa80cdb53b28e646ed876523653cbcc110588f..3b9b96503bdd530df7e88240a2495d50726f86ac 100755 (executable)
--- a/scripts/make-archive.sh
+++ b/scripts/make-archive.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 # Create a distribution tarball, like 'make dist' from autotools.
 cd "$(git rev-parse --show-toplevel)"
-ver="$(git describe | sed 's/^v//' | sed 's/-\(g[0-9a-f]\+\)/\.\1/')"
+ver="$(scripts/show-version.sh)"
 test 0 -ne $(git status --porcelain | wc -l) && \
        echo "Git working tree is dirty, make it clean first" && \
        exit 1

diff --git a/scripts/make-spec.sh b/scripts/make-spec.sh
new file mode 100755 (executable)
index 0000000..1c6c54b
--- /dev/null
+++ b/scripts/make-spec.sh
@@ -0,0 +1,11 @@
+#!/bin/bash -e
+
+# Fill in VERSION and PRERELEASE fields in Fedora spec file
+
+cd "$(git rev-parse --show-toplevel)"
+VERSION=$(scripts/show-version.sh | sed 's/knot-resolver-\(.*\).tar.xz/\1/' | cut -f1 -d '-')
+PRERELEASE=$(scripts/show-version.sh | sed 's/knot-resolver-\(.*\).tar.xz/\1/' | cut -f1 -d '-' --complement -s)
+sed -i.bak "s@%define VERSION .*@%define VERSION $VERSION@" distro/fedora/knot-resolver.spec
+if [ -n "$PRERELEASE" ]; then
+       sed -i "s@#%% define PRERELEASE .*@%define PRERELEASE $PRERELEASE@" distro/fedora/knot-resolver.spec
+fi

diff --git a/scripts/make-srpm.sh b/scripts/make-srpm.sh
index d139081b7efca33d4622ab67e0efefb1329a2edf..f8691cffd501f231c633374205609d75d75aaedb 100755 (executable)
--- a/scripts/make-srpm.sh
+++ b/scripts/make-srpm.sh
@@ -4,12 +4,7 @@
 
 cd "$(git rev-parse --show-toplevel)"
 scripts/make-archive.sh
-VERSION=$(ls knot-resolver-*.tar.xz | sed 's/knot-resolver-\(.*\).tar.xz/\1/' | cut -f1 -d '-')
-PRERELEASE=$(ls knot-resolver-*.tar.xz | sed 's/knot-resolver-\(.*\).tar.xz/\1/' | cut -f1 -d '-' --complement -s)
-sed -i.bak "s/%define VERSION .*/%define VERSION $VERSION/" distro/fedora/knot-resolver.spec
-if [ -n "$PRERELEASE" ]; then
-       sed -i "s/#%% define PRERELEASE .*/%define PRERELEASE $PRERELEASE/" distro/fedora/knot-resolver.spec
-fi
+scripts/make-spec.sh
 mv knot-resolver-*.tar.xz distro/fedora/
 cd distro/fedora
 rpkg srpm

diff --git a/scripts/show-version.sh b/scripts/show-version.sh
new file mode 100755 (executable)
index 0000000..565b2d8
--- /dev/null
+++ b/scripts/show-version.sh
@@ -0,0 +1,2 @@
+#!/bin/bash -e
+git describe | sed 's/^v//' | sed 's/-\(g[0-9a-f]\+\)/\.\1/'