From 1476fdc2d39fd955b372398dd0fed8a13aef7a5b Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 23 Apr 2013 11:59:40 +0200
Subject: [PATCH] pass rpmversion to prep.sh instead of trying to recompute it
 from the specfile in fact the specfile that prep.sh sees is the one that
 comes from git, which does not have the header prepended, so some variables
 are not defined and rpm squeaks

---
 bootcd.spec | 3 +--
 prep.sh     | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bootcd.spec b/bootcd.spec
index 32d4b76..a2e83ea 100644
--- a/bootcd.spec
+++ b/bootcd.spec
@@ -6,7 +6,6 @@
 %define taglevel 1
 
 # pldistro already in the rpm name
-#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %define release %{taglevel}%{?date:.%{date}}
 
 # structure - this results in 2 packages
@@ -75,7 +74,7 @@ Conflicts: MyPLC <= 4.3
 pushd bootcd
 
 # Build the reference image
-./prep.sh %{pldistro} %{nodefamily}
+./prep.sh %{pldistro} %{nodefamily} %{version}-%{taglevel}
 
 popd
 
diff --git a/prep.sh b/prep.sh
index ba985b9..6e256c0 100755
--- a/prep.sh
+++ b/prep.sh
@@ -28,6 +28,7 @@ export PATH
 
 pldistro=$1 ; shift
 nodefamily=$1; shift
+rpmversion=$1; shift
 
 # Packages to install, junk and precious : see build/<pldistro>/bootcd.pkgs
 
@@ -39,8 +40,8 @@ bootcd=$PWD/build/bootcd
 install -d -m 755 $bootcd
 
 # Write version number
-rpm -q --specfile bootcd.spec --queryformat '%{VERSION}\n' | head -1 > build/version.txt
-echo $nodefamily > build/nodefamily
+echo ${rpmversion} > build/version.txt
+echo ${nodefamily} > build/nodefamily
 
 # Install base system
 echo "* Creating fedora root image"
-- 
2.43.0