Changeset 959 for rpmbuild-bot

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.

Location:

rpmbuild-bot

Files:

• changelog.txt (modified) (1 diff)
• rpmbuild-bot.sh (modified) (3 diffs)

rpmbuild-bot/changelog.txt

@@ -1 +1 @@
 History of changes
 ------------------
+
+1.2.0 [xx.10.2016]
+  - Add move command to move packages between repositories.
+  - Remove log files before creating them (needed for recovering after some
+    failures).
+  - Print elapsed time after each succeded step and overall.
+  - Support stat timestamps w/o fractional part (new coreutils).
+  - Support per-package ARCH specification in -env.sh (useful for e.g.
+    binary-only RPMs that provide only one architecture, like libc).
+  - Run rpmbuild only once for noarch-only SPEC files (this also fixes a
+    regression when building such files with previous rpmbuild-bot versions).
+  - Automatically commit SPEC files to SVN on upload to ensure integrity
+    and consistency between published RPMs and their SPECs.
+  - Add support for automatic generation of legacy runtime sub-packages.
 
 1.1.0 [15.04.2016]

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..."