From 8bbb3344fc0fd6426bdbb243ee1d38046a267352cff22770e1d89d4c899ea9bd Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 5 Mar 2010 17:23:23 +0000 Subject: [PATCH 1/4] Accepting request 34179 from home:a_jaeger:branches:openSUSE:Factory Copy from home:a_jaeger:branches:openSUSE:Factory/build-compare via accept of submit request 34179 revision 42. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/34179 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=50 --- build-compare.changes | 10 ++++++++++ rpm-check.sh | 39 +++++++++++++++++++++++++++++++-------- 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index ac52bbd..8f85f3e 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Mar 5 09:46:01 UTC 2010 - aj@suse.de + +- Handle more man files. + +------------------------------------------------------------------- +Fri Dec 25 09:03:44 UTC 2009 - aj@suse.de + +- Handle Mono files. + ------------------------------------------------------------------- Sun Dec 13 12:59:16 UTC 2009 - aj@suse.de diff --git a/rpm-check.sh b/rpm-check.sh index 98b103d..502db46 100644 --- a/rpm-check.sh +++ b/rpm-check.sh @@ -238,14 +238,14 @@ check_single_file() sed -i -e "s,Release:.*$release1,Release: @RELEASE@," old/$file sed -i -e "s,Release:.*$release2,Release: @RELEASE@," new/$file ;; - *.dll|*.exe) - # we can't handle it well enough - if ! cmp -s old/$file new/$file; then - echo "mono $file differs" - return 1 - fi - return 0 - ;; +# *.dll|*.exe) +# # we can't handle it well enough +# if ! cmp -s old/$file new/$file; then +# echo "mono $file differs" +# return 1 +# fi +# return 0 +# ;; *.a) echo "$file is .a" flist=`ar t new/$file` @@ -376,6 +376,14 @@ check_single_file() sed -i -e 's| 3 "20..-..-.." "perl v5....." "User Contributed Perl Documentation"$| 3 "2009-01-01" "perl v5.10.0" "User Contributed Perl Documentation"|' $f done ;; + /usr/share/man/man*/*) + # Handles lines like: + # .TH debhelper 7 "2010-02-27" "7.4.15" "Debhelper" + # .TH DIRMNGR-CLIENT 1 2010-02-27 "Dirmngr 1.0.3" "GNU Privacy Guard" + for f in old/$file new/$file; do + sed -i -e 's|^\.TH \(.*\) . 20..-..-.. |.TH . 2000-01-01 |' $f + done + ;; *.elc) # emacs lisp files for f in old/$file new/$file; do @@ -407,6 +415,21 @@ check_single_file() ftype=`/usr/bin/file old/$file | cut -d: -f2-` case $ftype in + (*PE32\ executable\ for\ MS\ Windows\ *\ Mono/.Net\ assembly*) + echo "PE32 Mono/.Net assembly: $file" + if [ -x /usr/bin/monodis ] ; then + monodis --output=${file1} old/$file + monodis --output=${file2} new/$file + if ! cmp -s ${file1} ${file2}; then + echo "$file differs ($ftype)" + diff -u ${file1} ${file2} + return 1 + fi + else + echo "cannot compare, no monodis installed" + return 1 + fi + ;; *executable*|*LSB\ shared\ object*) objdump -d --no-show-raw-insn old/$file | filter_disasm > $file1 if ! test -s $file1; then From 3f485819965a686c284301b9f7f2212481952a7d25760d80e1a8257c2998f259 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 5 Mar 2010 17:26:25 +0000 Subject: [PATCH 2/4] Accepting request 34181 from home:a_jaeger:branches:openSUSE:Factory Copy from home:a_jaeger:branches:openSUSE:Factory/build-compare via accept of submit request 34181 revision 45. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/34181 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=51 --- build-compare.changes | 5 ----- rpm-check.sh | 31 ++++++++----------------------- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 8f85f3e..6b0d74e 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -3,11 +3,6 @@ Fri Mar 5 09:46:01 UTC 2010 - aj@suse.de - Handle more man files. -------------------------------------------------------------------- -Fri Dec 25 09:03:44 UTC 2009 - aj@suse.de - -- Handle Mono files. - ------------------------------------------------------------------- Sun Dec 13 12:59:16 UTC 2009 - aj@suse.de diff --git a/rpm-check.sh b/rpm-check.sh index 502db46..f380c3f 100644 --- a/rpm-check.sh +++ b/rpm-check.sh @@ -238,14 +238,14 @@ check_single_file() sed -i -e "s,Release:.*$release1,Release: @RELEASE@," old/$file sed -i -e "s,Release:.*$release2,Release: @RELEASE@," new/$file ;; -# *.dll|*.exe) -# # we can't handle it well enough -# if ! cmp -s old/$file new/$file; then -# echo "mono $file differs" -# return 1 -# fi -# return 0 -# ;; + *.dll|*.exe) + # we can't handle it well enough + if ! cmp -s old/$file new/$file; then + echo "mono $file differs" + return 1 + fi + return 0 + ;; *.a) echo "$file is .a" flist=`ar t new/$file` @@ -415,21 +415,6 @@ check_single_file() ftype=`/usr/bin/file old/$file | cut -d: -f2-` case $ftype in - (*PE32\ executable\ for\ MS\ Windows\ *\ Mono/.Net\ assembly*) - echo "PE32 Mono/.Net assembly: $file" - if [ -x /usr/bin/monodis ] ; then - monodis --output=${file1} old/$file - monodis --output=${file2} new/$file - if ! cmp -s ${file1} ${file2}; then - echo "$file differs ($ftype)" - diff -u ${file1} ${file2} - return 1 - fi - else - echo "cannot compare, no monodis installed" - return 1 - fi - ;; *executable*|*LSB\ shared\ object*) objdump -d --no-show-raw-insn old/$file | filter_disasm > $file1 if ! test -s $file1; then From 6a34e6f3076a7be96917653e07f077e26c1fa47a7a03c5a76a9d4f41421a4a81 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sat, 6 Mar 2010 04:03:19 +0000 Subject: [PATCH 3/4] Accepting request 34194 from home:a_jaeger:branches:openSUSE:Factory Copy from home:a_jaeger:branches:openSUSE:Factory/build-compare via accept of submit request 34194 revision 49. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/34194 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=52 --- build-compare.changes | 5 +++++ rpm-check.sh | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build-compare.changes b/build-compare.changes index 6b0d74e..df8d6c5 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Mar 6 04:01:36 UTC 2010 - aj@suse.de + +- Improve regexp for last change. + ------------------------------------------------------------------- Fri Mar 5 09:46:01 UTC 2010 - aj@suse.de diff --git a/rpm-check.sh b/rpm-check.sh index f380c3f..3024d8d 100644 --- a/rpm-check.sh +++ b/rpm-check.sh @@ -380,8 +380,9 @@ check_single_file() # Handles lines like: # .TH debhelper 7 "2010-02-27" "7.4.15" "Debhelper" # .TH DIRMNGR-CLIENT 1 2010-02-27 "Dirmngr 1.0.3" "GNU Privacy Guard" + # .TH ccmake 1 "March 06, 2010" "ccmake 2.8.1-rc3" for f in old/$file new/$file; do - sed -i -e 's|^\.TH \(.*\) . 20..-..-.. |.TH . 2000-01-01 |' $f + sed -i -e 's|^\.TH \(.*\) \(.\) \("\?20..-..-.."\?\|"[a-zA-Z]* [0-9][0-9], 20[0-9][0-9]"\) |.TH \1 \2 "2000-01-01" |' $f done ;; *.elc) From 117c8ea12ffaf1894c2bd5f12a133adb4bd0433e66ee51d9bc462eed643052cb Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sun, 7 Mar 2010 09:54:15 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/build-compare revision 22.0 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=a4bfb5b143d6941b934c78b307fc681c --- build-compare.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-compare.spec b/build-compare.spec index eb90f16..f5e46a9 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -1,7 +1,7 @@ # # spec file for package build-compare (Version 2009.10.14) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ Group: Development/Tools/Building AutoReqProv: on Summary: Build Result Compare Script Version: 2009.10.14 -Release: 4 +Release: 5 Source: same-build-result.sh Source1: rpm-check.sh Source2: COPYING