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

diff --git a/bootcd.spec b/bootcd.spec
index 32d4b76..a2e83ea 100644 (file)
--- 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 (executable)
--- 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"