From 616bd83c6d8a674322e5d5bd21952810aa364d7c Mon Sep 17 00:00:00 2001
From: Tor Egge <Tor.Egge@online.no>
Date: Sun, 31 Oct 2021 03:26:40 +0100
Subject: Update vespa version in pom files as part of preparing for build.

---
 dist/vespa.spec | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'dist')

diff --git a/dist/vespa.spec b/dist/vespa.spec
index e6eff61b214..f02475ae916 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -487,6 +487,15 @@ nearest neighbor search used for low-level benchmarking.
 %setup -c -D -T
 %else
 %setup -q
+echo '%{version}' > VERSION
+case '%{version}' in
+    *.0)
+	:
+	;;
+    *)
+	sed -i -e 's,<version>7-SNAPSHOT</version>,<version>%{version}</version>,' $(find . -name pom.xml -print)
+	;;
+esac
 %endif
 
 %build
-- 
cgit v1.2.3


From 45310ad30e3961fd99e8d243b24603f49221be94 Mon Sep 17 00:00:00 2001
From: Tor Egge <Tor.Egge@online.no>
Date: Mon, 1 Nov 2021 11:10:33 +0100
Subject: Match any snapshot version.

---
 dist/vespa.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dist')

diff --git a/dist/vespa.spec b/dist/vespa.spec
index f02475ae916..90a627125d2 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -493,7 +493,7 @@ case '%{version}' in
 	:
 	;;
     *)
-	sed -i -e 's,<version>7-SNAPSHOT</version>,<version>%{version}</version>,' $(find . -name pom.xml -print)
+	sed -i -e 's,<version>[0-9].*-SNAPSHOT</version>,<version>%{version}</version>,' $(find . -name pom.xml -print)
 	;;
 esac
 %endif
-- 
cgit v1.2.3