Changeset 959 for rpmbuild-bot/rpmbuild-bot.sh

Timestamp:

Feb 8, 2017, 10:23:32 AM (9 years ago)

Author:

dmik

Message:

rpmbuild-bot: Store version number with dist mark for legacy packages.

This is to have a proper version field in generated legacy sub-packages.

File:

• rpmbuild-bot/rpmbuild-bot.sh (modified) (3 diffs)

rpmbuild-bot/rpmbuild-bot.sh

@@ -366 +366 @@
     [ -z "$mask" ] && mask="*.dll"
 
+    # add the dist suffix, if any, to ver (to make it consistent)
+    ver="$ver$dist_mark"
+
     abi_list="$abi_list${abi_list:+ }$abi"
 
@@ -371 +374 @@
     echo "Getting legacy runtime ($mask) for ABI '$abi'..."
     for arch in ${legacy_arch:-${arch_list}} ; do
-      eval local rpm="$RPMBUILD_BOT_UPLOAD_REPO_LAYOUT_rpm/$name-$ver$dist_mark.$arch.rpm"
+      eval local rpm="$RPMBUILD_BOT_UPLOAD_REPO_LAYOUT_rpm/$name-$ver.$arch.rpm"
       local tgt_dir="$src_dir/$spec_name-legacy/$abi/$arch"
       # Check filenames and timestamps
@@ -389 +392 @@
         find "$tgt_dir" -type f -printf '/%P\n' > "$tgt_dir.files.list"
         # now try to locate the debuginfo package and extract *.dbg from it
-        eval local debug_rpm="$RPMBUILD_BOT_UPLOAD_REPO_LAYOUT_rpm/$name-debuginfo-$ver$dist_mark.$arch.rpm"
-        [ ! -f "$debug_rpm" ] && eval debug_rpm="$RPMBUILD_BOT_UPLOAD_REPO_LAYOUT_rpm/$name-debug-$ver$dist_mark.$arch.rpm"
+        eval local debug_rpm="$RPMBUILD_BOT_UPLOAD_REPO_LAYOUT_rpm/$name-debuginfo-$ver.$arch.rpm"
+        [ ! -f "$debug_rpm" ] && eval debug_rpm="$RPMBUILD_BOT_UPLOAD_REPO_LAYOUT_rpm/$name-debug-$ver.$arch.rpm"
         if [ -f "$debug_rpm" ] ; then
           echo "Found debug info package $debug_rpm, extracting..."