Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at 2022-12-15 19:23:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/build-compare (Old) and /work/SRC/openSUSE:Factory/.build-compare.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build-compare" Thu Dec 15 19:23:33 2022 rev:124 rq:1042784 version:20221206T204012.bb70754 Changes: -------- --- /work/SRC/openSUSE:Factory/build-compare/build-compare.changes 2022-10-08 01:22:35.737867821 +0200 +++ /work/SRC/openSUSE:Factory/.build-compare.new.1835/build-compare.changes 2022-12-15 19:23:37.055514339 +0100 @@ -1,0 +2,5 @@ +Fri Nov 25 23:51:35 UTC 2022 - Stefan Brüns <[email protected]> + +- Trim "PROVIDES" from source rpms (#59, bsc#1205998) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build-compare.spec ++++++ --- /var/tmp/diff_new_pack.H1hGDn/_old 2022-12-15 19:23:37.583517343 +0100 +++ /var/tmp/diff_new_pack.H1hGDn/_new 2022-12-15 19:23:37.591517389 +0100 @@ -17,7 +17,7 @@ Name: build-compare -Version: 20220926T095347.40c240f +Version: 20221206T204012.bb70754 Release: 0 Summary: Build Result Compare Script License: GPL-2.0-or-later ++++++ functions.sh ++++++ --- /var/tmp/diff_new_pack.H1hGDn/_old 2022-12-15 19:23:37.655517753 +0100 +++ /var/tmp/diff_new_pack.H1hGDn/_new 2022-12-15 19:23:37.659517775 +0100 @@ -122,6 +122,8 @@ QF_CHECKSUM="[%{FILENAMES} %{FILEMD5S} %{FILEFLAGS}\n]\\n" +QF_SOURCERPM="%{SOURCERPM}\\n" + QF_ALL="\n___QF_NAME___\n${QF_NAME}\n___QF_NAME___\n" QF_ALL="$QF_ALL\n___QF_TAGS___\n${QF_TAGS}\n___QF_TAGS___\n" QF_ALL="$QF_ALL\n___QF_VER_REL___\n${QF_VER_REL}\n___QF_VER_REL___\n" @@ -130,6 +132,7 @@ QF_ALL="$QF_ALL\n___QF_SCRIPT___\n${QF_SCRIPT}\n___QF_SCRIPT___\n" QF_ALL="$QF_ALL\n___QF_FILELIST___\n${QF_FILELIST}\n___QF_FILELIST___\n" QF_ALL="$QF_ALL\n___QF_CHECKSUM___\n${QF_CHECKSUM}\n___QF_CHECKSUM___\n" +QF_ALL="$QF_ALL\n___QF_SOURCERPM___\n${QF_SOURCERPM}\n___QF_SOURCERPM___\n" } check_header() @@ -286,6 +289,17 @@ name_ver_rel_new_regex_l=${name_ver_rel_new//./\\.} } +# Trim a block starting with a keyword and ending with an empty line +# $1: enable +# $2: keyword +function trim_section() { + if test "${1}" -gt 0 ; then + sed -e "/^${2}$/,/^$/d" + else + cat + fi +} + # Compare just the rpm meta data of two rpms # Returns: # 0 in case of same content @@ -365,8 +379,12 @@ esac fi - get_value QF_PROVIDES $rpm_meta_old | trim_release_old | sort > $file1 - get_value QF_PROVIDES $rpm_meta_new | trim_release_new | sort > $file2 + # Built packages provide the sourcerpm, for the sourcerpm itself it is "(none)" + [ "x$(get_value QF_SOURCERPM $rpm_meta_new)" == "x(none)" ] && is_sourcerpm=1 || is_sourcerpm=0 + + # FIXME: PROVIDE needs to be handled independent from the other tags + get_value QF_PROVIDES $rpm_meta_old | trim_section ${is_sourcerpm} 'PROVIDE' | trim_release_old | sort > $file1 + get_value QF_PROVIDES $rpm_meta_new | trim_section ${is_sourcerpm} 'PROVIDE' | trim_release_new | sort > $file2 if ! comp_file PROVIDES $file1 $file2 $rpm_meta_old $rpm_meta_new; then rm -rf "$tmpdir" return 1 ++++++ same-build-result.sh ++++++ --- /var/tmp/diff_new_pack.H1hGDn/_old 2022-12-15 19:23:37.683517912 +0100 +++ /var/tmp/diff_new_pack.H1hGDn/_new 2022-12-15 19:23:37.683517912 +0100 @@ -95,7 +95,7 @@ fi echo "compare $osrpm $nsrpm" -if bash $SCMPSCRIPT "$osrpm" "$nsrpm" +if bash $SCMPSCRIPT $check_all "$osrpm" "$nsrpm" then : src.rpm identical else
