From 43ad56bd294623474ae2237fa49ec5ad6faa2a9932f52b85cbca814a7ced7dae Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 13 May 2020 17:14:02 +0000 Subject: [PATCH 1/2] - compare also posttrans scripts, and pretrans + verifyscript OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=271 --- build-compare.changes | 5 +++++ build-compare.spec | 2 +- functions.sh | 15 ++++++++++++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 0bb0330..6064b73 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 13 13:13:13 UTC 2020 - olaf@aepfle.de + +- compare also posttrans scripts, and pretrans + verifyscript + ------------------------------------------------------------------- Tue May 5 05:05:05 UTC 2020 - olaf@aepfle.de diff --git a/build-compare.spec b/build-compare.spec index ddf7a41..6a0eff4 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -21,7 +21,7 @@ Summary: Build Result Compare Script License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/build-compare -Version: 20200508T210136.9aadd6e +Version: 20200513T191311.ef45e71 Release: 0 Source1: COPYING Source2: same-build-result.sh diff --git a/functions.sh b/functions.sh index a9b8fdf..34f3cb1 100644 --- a/functions.sh +++ b/functions.sh @@ -59,7 +59,20 @@ QF_TAGS="${QF_TAGS}[%{VERIFYSCRIPTPROG} %{VERIFYSCRIPT}]\\n" 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" +script_types=' +PRETRANS +PREIN +POSTIN +PREUN +POSTUN +POSTTRANS +VERIFYSCRIPT +' +QF_SCRIPT= +for script_type in ${script_types} +do + QF_SCRIPT="${QF_SCRIPT}[%{${script_type}PROG} %{${script_type}FLAGS} %{${script_type}}\\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 From c91e308f661cb8e40692c0e457b2f6080e08e07c0041529d57c80ba568558a7e Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Thu, 14 May 2020 07:52:23 +0000 Subject: [PATCH 2/2] - Trim first line of man page to catch overly verbose tools (now Pandoc) OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=272 --- build-compare.changes | 5 +++++ build-compare.spec | 2 +- pkg-diff.sh | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 6064b73..fcc8443 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 14 07:07:07 UTC 2020 - olaf@aepfle.de + +- Trim first line of man page to catch overly verbose tools (now Pandoc) + ------------------------------------------------------------------- Wed May 13 13:13:13 UTC 2020 - olaf@aepfle.de diff --git a/build-compare.spec b/build-compare.spec index 6a0eff4..af4c85a 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -21,7 +21,7 @@ Summary: Build Result Compare Script License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/build-compare -Version: 20200513T191311.ef45e71 +Version: 20200514T095116.be3487c Release: 0 Source1: COPYING Source2: same-build-result.sh diff --git a/pkg-diff.sh b/pkg-diff.sh index fc3363c..ead49f5 100644 --- a/pkg-diff.sh +++ b/pkg-diff.sh @@ -207,11 +207,12 @@ trim_man_first_line() { # 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 }