Accepting request 805486 from openSUSE:Tools

- Trim first line of man page to catch overly verbose tools (now Pandoc)

- compare also posttrans scripts, and pretrans + verifyscript

OBS-URL: https://build.opensuse.org/request/show/805486
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/build-compare?expand=0&rev=115

build-compare.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+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
+
+- compare also posttrans scripts, and pretrans + verifyscript
+
 -------------------------------------------------------------------
 Tue May  5 05:05:05 UTC 2020 - olaf@aepfle.de
 

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:        20200514T095116.be3487c
 Release:        0
 Source1:        COPYING
 Source2:        same-build-result.sh

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

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
 }