Hello community, here is the log from the commit of package build-compare for openSUSE:Leap:15.2 checked in at 2020-06-04 16:01:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/build-compare (Old) and /work/SRC/openSUSE:Leap:15.2/.build-compare.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build-compare" Thu Jun 4 16:01:34 2020 rev:24 rq:810942 version:20200529T185052.7a95d20 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/build-compare/build-compare.changes 2020-02-16 18:25:34.322631668 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.build-compare.new.3606/build-compare.changes 2020-06-04 16:03:02.375380080 +0200 @@ -1,0 +2,28 @@ +Fri May 29 07:30:51 UTC 2020 - [email protected] + +- Colltect a list of known rpm tags and use it to build the + queryformat string for the tags listed below (bsc#1172232) + conflict obsolete oldsuggests provide recommend require suggest supplement + +------------------------------------------------------------------- +Thu May 14 07:07:07 UTC 2020 - [email protected] + +- Trim first line of man page to catch overly verbose tools (now Pandoc) + +------------------------------------------------------------------- +Wed May 13 13:13:13 UTC 2020 - [email protected] + +- compare also posttrans scripts, and pretrans + verifyscript + +------------------------------------------------------------------- +Tue May 5 05:05:05 UTC 2020 - [email protected] + +- handle oddly named ZIP archives +- touch watchdog every 15 instead of 57 minutes + +------------------------------------------------------------------- +Tue Mar 31 09:09:09 UTC 2020 - [email protected] + +- gtk-doc: filter version info from html files + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build-compare.spec ++++++ --- /var/tmp/diff_new_pack.Sixjbo/_old 2020-06-04 16:03:02.835382135 +0200 +++ /var/tmp/diff_new_pack.Sixjbo/_new 2020-06-04 16:03:02.839382154 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/build-compare -Version: 20200115T165709.b82e1e5 +Version: 20200529T185052.7a95d20 Release: 0 Source1: COPYING Source2: same-build-result.sh ++++++ functions.sh ++++++ --- /var/tmp/diff_new_pack.Sixjbo/_old 2020-06-04 16:03:02.891382386 +0200 +++ /var/tmp/diff_new_pack.Sixjbo/_new 2020-06-04 16:03:02.891382386 +0200 @@ -10,36 +10,59 @@ RPM="rpm -qp --nodigest --nosignature" +declare -a rpm_querytags +collect_rpm_querytags() { + rpm_querytags=( $(rpm --querytags) ) +} +# returns 0 if tag is known, returns 1 if unknown +rpmtag_known() { + local needle="\<${1}\>" + local haystack="${rpm_querytags[@]}" + [[ "${haystack}" =~ ${needle} ]] + return $? +} + set_rpm_meta_global_variables() { local pkg=$1 local rpm_tags= local out=`mktemp` + local t v qt + local -a type variant list # Name, Version, Release QF_NAME="%{NAME}" QF_VER_REL="%{VERSION}-%{RELEASE}" QF_NAME_VER_REL="%{NAME}-%{VERSION}-%{RELEASE}" -# provides destroy this because at least the self-provide includes the -# -buildnumber :-( -QF_PROVIDES="[%{PROVIDENAME} %{PROVIDEFLAGS} %{PROVIDEVERSION}\\n]\\n" -QF_PROVIDES="${QF_PROVIDES}[%{REQUIRENAME} %{REQUIREFLAGS} %{REQUIREVERSION}\\n]\\n" -QF_PROVIDES="${QF_PROVIDES}[%{CONFLICTNAME} %{CONFLICTFLAGS} %{CONFLICTVERSION}\\n]\\n" -QF_PROVIDES="${QF_PROVIDES}[%{OBSOLETENAME} %{OBSOLETEFLAGS} %{OBSOLETEVERSION}\\n]\\n" - -rpm_tags="%{RECOMMENDNAME} %{RECOMMENDFLAGS} %{RECOMMENDVERSION}" -check_header "%{NAME} ${rpm_tags}" > "${out}" -if test -s "${out}" -then - QF_PROVIDES="${QF_PROVIDES}[${rpm_tags}\\n]\\n" -fi -rpm_tags="%{SUPPLEMENTNAME} %{SUPPLEMENTFLAGS} %{SUPPLEMENTVERSION}" -check_header "%{NAME} ${rpm_tags}" > "${out}" -if test -s "${out}" -then - QF_PROVIDES="${QF_PROVIDES}[${rpm_tags}\\n]\\n" -fi +QF_PROVIDES= +type=( + CONFLICT + OBSOLETE + OLDSUGGESTS + PROVIDE + RECOMMEND + REQUIRE + SUGGEST + SUPPLEMENT +) +variant=( + NAME + FLAGS + VERSION +) +for t in "${type[@]}" +do + unset list + list=() + for v in "${variant[@]}" + do + qt="${t}${v}" + rpmtag_known "${qt}" || continue + list+=("%{${qt}}") + done + QF_PROVIDES+="${t}\\n[${list[@]}\\n]\\n" +done # don't look at RELEASE, it contains our build number QF_TAGS="%{NAME} %{VERSION} %{EPOCH}\\n" @@ -54,12 +77,37 @@ # XXX We also need to check the existence (but not the content (!)) # of SIGGPG (and perhaps the other SIG*) # XXX We don't look at triggers -QF_TAGS="${QF_TAGS}[%{VERIFYSCRIPTPROG} %{VERIFYSCRIPT}]\\n" # Only the first ChangeLog entry; should be enough QF_TAGS="${QF_TAGS}%{CHANGELOGTIME} %{CHANGELOGNAME} %{CHANGELOGTEXT}\\n" # scripts, might contain release number -QF_SCRIPT="[%{PREINPROG} %{PREIN}\\n]\\n[%{POSTINPROG} %{POSTIN}\\n]\\n[%{PREUNPROG} %{PREUN}\\n]\\n[%{POSTUNPROG} %{POSTUN}\\n]\\n" +QF_SCRIPT= +type=( + PRETRANS + PREIN + POSTIN + PREUN + POSTUN + POSTTRANS + VERIFYSCRIPT +) +variant=( + PROG + FLAGS + '' +) +for t in "${type[@]}" +do + unset list + list=() + for v in "${variant[@]}" + do + qt="${t}${v}" + rpmtag_known "${qt}" || continue + list+=("%{${qt}}") + done + QF_SCRIPT+="${t}\\n[${list[@]}\\n]\\n" +done # Now the files. We leave out mtime and size. For normal files # the size will influence the MD5 anyway. For directories the sizes can @@ -243,6 +291,7 @@ rpm_meta_old=`mktemp` rpm_meta_new=`mktemp` + collect_rpm_querytags set_rpm_meta_global_variables $oldrpm check_header "$QF_ALL" $oldrpm > $rpm_meta_old ++++++ pkg-diff.sh ++++++ --- /var/tmp/diff_new_pack.Sixjbo/_old 2020-06-04 16:03:02.907382458 +0200 +++ /var/tmp/diff_new_pack.Sixjbo/_new 2020-06-04 16:03:02.907382458 +0200 @@ -6,7 +6,7 @@ # Written by Michael Matz and Stephan Coolo # Enhanced by Andreas Jaeger declare -i watchdog_host_timeout_seconds='3600' -declare -i watchdog_touch_percent_prior_timeout='96' +declare -i watchdog_touch_percent_prior_timeout='25' declare -i watchdog_next_touch_seconds=0 function watchdog_reset @@ -207,11 +207,12 @@ { # Handles the first line if it is like: #.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) + #.\" Automatically generated by Pandoc 2.9.2.1 #.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3. local f=$1 [[ $nofilter ]] && return sed -i -e '1{ - s|^\.\\"[[:blank:]]\+Automatically[[:blank:]]generated[[:blank:]]by[[:blank:]]Pod::Man[[:blank:]].*|.\\" Overly verbose Pod::Man| + s|^\.\\"[[:blank:]]\+Automatically[[:blank:]]generated[[:blank:]]by[[:blank:]].*|.\\" Automatically generated by SomeTool| s|^\.\\"[[:blank:]]\+DO[[:blank:]]NOT[[:blank:]]MODIFY[[:blank:]]THIS[[:blank:]]FILE![[:blank:]]\+It[[:blank:]]was[[:blank:]]generated[[:blank:]]by[[:blank:]]help2man[[:blank:]].*|.\\" Overly verbose help2man| }' $f } @@ -438,6 +439,20 @@ /usr/share/gtk-doc/html/*/*.devhelp2) # various kde and gtk packages strip_numbered_anchors + for f in old/$file new/$file; do + sed -i -e ' + /^<head>/{ + : next + n + /^<\/head>/{ + b end_head + } + s/^<meta name="generator" content="[^"]\+">/<meta name="generator" content="GTK-Doc V1.29 (XML mode)">/ + b next + } + : end_head + ' $f + done ;; /usr/share/doc/packages/*/*.html|\ /usr/share/doc/packages/*/*/*.html|\ @@ -1033,6 +1048,11 @@ return 1 fi ;; + Zip\ archive\ data,*) + if ! compare_archive "${file}" 'archive_zip' ; then + return 1 + fi + ;; POSIX\ tar\ archive) mv old/$file{,.tar} mv new/$file{,.tar}
