From fa1e1998e51f9d29b88ca16c847c28f09ba3e7bce1c3ead536bef1ed99a1010d Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 25 May 2010 07:35:03 +0000 Subject: [PATCH 1/5] Accepting request 40612 from home:a_jaeger:branches:build-compare-test Copy from home:a_jaeger:branches:build-compare-test/build-compare via accept of submit request 40612 revision 30. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/40612 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=71 --- build-compare.changes | 10 ++++++++++ rpm-check.sh | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 38b70b8..01f454d 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun May 23 12:19:56 UTC 2010 - aj@suse.de + +- Release is at end of line, avoid wrong matches. + +------------------------------------------------------------------- +Fri May 21 21:46:47 UTC 2010 - cmorve69@yahoo.es + +- Improved ELF executable detection (bnc#604049). + ------------------------------------------------------------------- Thu May 20 08:23:52 UTC 2010 - aj@suse.de diff --git a/rpm-check.sh b/rpm-check.sh index a1ef2bc..b80f9aa 100644 --- a/rpm-check.sh +++ b/rpm-check.sh @@ -159,7 +159,7 @@ check_provides() QF="$QF [%{REQUIRENAME} %{REQUIREFLAGS} %{REQUIREVERSION}\\n]\\n" QF="$QF [%{CONFLICTNAME} %{CONFLICTFLAGS} %{CONFLICTVERSION}\\n]\\n" QF="$QF [%{OBSOLETENAME} %{OBSOLETEFLAGS} %{OBSOLETEVERSION}\\n]\\n" - check_header "$1" | sed -e "s,-$2,-@RELEASE@," + check_header "$1" | sed -e "s,-$2$,-@RELEASE@," } check_provides $oldrpm $release1 > $file1 @@ -462,7 +462,7 @@ check_single_file() return 1 fi ;; - *executable*|*LSB\ shared\ object*) + *ELF*executable*|*ELF*LSB\ shared\ object*) objdump -d --no-show-raw-insn old/$file | filter_disasm > $file1 if ! test -s $file1; then # objdump has no idea how to handle it From 57861b39d67052825efaeef315d110813dbf73e55b95e67b7eb0e766af9d7078 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 25 May 2010 12:57:16 +0000 Subject: [PATCH 2/5] Accepting request 40613 from openSUSE:Tools checked in (request 40613) OBS-URL: https://build.opensuse.org/request/show/40613 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=72 --- build-compare.changes | 10 ---------- rpm-check.sh | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 01f454d..38b70b8 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Sun May 23 12:19:56 UTC 2010 - aj@suse.de - -- Release is at end of line, avoid wrong matches. - -------------------------------------------------------------------- -Fri May 21 21:46:47 UTC 2010 - cmorve69@yahoo.es - -- Improved ELF executable detection (bnc#604049). - ------------------------------------------------------------------- Thu May 20 08:23:52 UTC 2010 - aj@suse.de diff --git a/rpm-check.sh b/rpm-check.sh index b80f9aa..a1ef2bc 100644 --- a/rpm-check.sh +++ b/rpm-check.sh @@ -159,7 +159,7 @@ check_provides() QF="$QF [%{REQUIRENAME} %{REQUIREFLAGS} %{REQUIREVERSION}\\n]\\n" QF="$QF [%{CONFLICTNAME} %{CONFLICTFLAGS} %{CONFLICTVERSION}\\n]\\n" QF="$QF [%{OBSOLETENAME} %{OBSOLETEFLAGS} %{OBSOLETEVERSION}\\n]\\n" - check_header "$1" | sed -e "s,-$2$,-@RELEASE@," + check_header "$1" | sed -e "s,-$2,-@RELEASE@," } check_provides $oldrpm $release1 > $file1 @@ -462,7 +462,7 @@ check_single_file() return 1 fi ;; - *ELF*executable*|*ELF*LSB\ shared\ object*) + *executable*|*LSB\ shared\ object*) objdump -d --no-show-raw-insn old/$file | filter_disasm > $file1 if ! test -s $file1; then # objdump has no idea how to handle it From 63216b23312598ba27d1a8cc9a40e03c19591c9f8d499a40d62c45a7c9388d80 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 29 Aug 2010 08:12:19 +0000 Subject: [PATCH 3/5] Accepting request 46512 from home:a_jaeger:branches:build-compare-test Copy from home:a_jaeger:branches:build-compare-test/build-compare via accept of submit request 46512 revision 33. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/46512 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=73 --- build-compare.changes | 20 ++++++++++++++++++++ build-compare.spec | 2 +- rpm-check.sh | 21 +++++++++++++++++++-- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 38b70b8..88e95e0 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Aug 27 08:59:22 UTC 2010 - aj@suse.de + +- Handle png files with timestamp if convert is installed. + +------------------------------------------------------------------- +Fri Aug 27 06:50:13 UTC 2010 - aj@suse.de + +- Handle one more doxygen variation. + +------------------------------------------------------------------- +Sun May 23 12:19:56 UTC 2010 - aj@suse.de + +- Release is at end of line, avoid wrong matches. + +------------------------------------------------------------------- +Fri May 21 21:46:47 UTC 2010 - cmorve69@yahoo.es + +- Improved ELF executable detection (bnc#604049). + ------------------------------------------------------------------- Thu May 20 08:23:52 UTC 2010 - aj@suse.de diff --git a/build-compare.spec b/build-compare.spec index a813131..5d6a421 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -24,7 +24,7 @@ Group: Development/Tools/Building AutoReqProv: on Summary: Build Result Compare Script Version: 2009.10.14 -Release: 13 +Release: 14 Source: same-build-result.sh Source1: rpm-check.sh Source2: COPYING diff --git a/rpm-check.sh b/rpm-check.sh index a1ef2bc..48306ed 100644 --- a/rpm-check.sh +++ b/rpm-check.sh @@ -159,7 +159,7 @@ check_provides() QF="$QF [%{REQUIRENAME} %{REQUIREFLAGS} %{REQUIREVERSION}\\n]\\n" QF="$QF [%{CONFLICTNAME} %{CONFLICTFLAGS} %{CONFLICTVERSION}\\n]\\n" QF="$QF [%{OBSOLETENAME} %{OBSOLETEFLAGS} %{OBSOLETEVERSION}\\n]\\n" - check_header "$1" | sed -e "s,-$2,-@RELEASE@," + check_header "$1" | sed -e "s,-$2$,-@RELEASE@," } check_provides $oldrpm $release1 > $file1 @@ -327,6 +327,21 @@ check_single_file() check_single_file ${file/.gz/} return $? ;; + *png) + # Try to remove timestamps, only if convert from ImageMagick is installed + if [[ $(type -p convert) ]]; then + convert old/$file +set date:create +set date:modify old/${file/.png/_n.png} + convert old/$file +set date:create +set date:modify new/${file/.png/_n.png} + if ! cmp -s old/${file/.png/_n.png} new/${file/.png/_n.png}; then + echo "$file differs ($ftype)" + hexdump -C old/${file/.png/_n.png} > $file1 + hexdump -C new/${file/.png/_n.png} > $file2 + diff -u $file1 $file2 | head -n 20 + return 1 + fi + return 0 + fi + ;; /usr/share/locale/*/LC_MESSAGES/*.mo|/usr/share/locale-bundle/*/LC_MESSAGES/*.mo) for f in old/$file new/$file; do sed -i -e "s,POT-Creation-Date: ....-..-.. ..:..+....,POT-Creation-Date: 1970-01-01 00:00+0000," $f @@ -339,6 +354,8 @@ check_single_file() sed -i -e 's|^ *This document was generated by Autobuild on .*, 20.. using texi2html .\....$| This document was generated by Autobuild on August 7, 2009 using texi2html 1.82.|' $f # doxygen docu, e.g. in libssh and log4c sed -i -e 's|Generated on ... ... [0-9]* [0-9]*:[0-9][0-9]:[0-9][0-9] 20[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |' $f + # Generated on Sat Aug 14 2010 16:49:48 for libssh + sed -i -e 's|Generated on ... ... [0-9]* 20[0-9][0-9] [0-9]*:[0-9][0-9]:[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |' $f done ;; /usr/share/javadoc/*.html |\ @@ -462,7 +479,7 @@ check_single_file() return 1 fi ;; - *executable*|*LSB\ shared\ object*) + *ELF*executable*|*ELF*LSB\ shared\ object*) objdump -d --no-show-raw-insn old/$file | filter_disasm > $file1 if ! test -s $file1; then # objdump has no idea how to handle it From b3966de8d8979515a7cbcf5ffac28bafe9903a7db7a271273d0362e496be4d62 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 30 Aug 2010 10:44:03 +0000 Subject: [PATCH 4/5] Accepting request 46548 from openSUSE:Tools checked in (request 46548) OBS-URL: https://build.opensuse.org/request/show/46548 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=74 --- build-compare.changes | 10 ---------- rpm-check.sh | 17 ----------------- 2 files changed, 27 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 88e95e0..01f454d 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Fri Aug 27 08:59:22 UTC 2010 - aj@suse.de - -- Handle png files with timestamp if convert is installed. - -------------------------------------------------------------------- -Fri Aug 27 06:50:13 UTC 2010 - aj@suse.de - -- Handle one more doxygen variation. - ------------------------------------------------------------------- Sun May 23 12:19:56 UTC 2010 - aj@suse.de diff --git a/rpm-check.sh b/rpm-check.sh index 48306ed..b80f9aa 100644 --- a/rpm-check.sh +++ b/rpm-check.sh @@ -327,21 +327,6 @@ check_single_file() check_single_file ${file/.gz/} return $? ;; - *png) - # Try to remove timestamps, only if convert from ImageMagick is installed - if [[ $(type -p convert) ]]; then - convert old/$file +set date:create +set date:modify old/${file/.png/_n.png} - convert old/$file +set date:create +set date:modify new/${file/.png/_n.png} - if ! cmp -s old/${file/.png/_n.png} new/${file/.png/_n.png}; then - echo "$file differs ($ftype)" - hexdump -C old/${file/.png/_n.png} > $file1 - hexdump -C new/${file/.png/_n.png} > $file2 - diff -u $file1 $file2 | head -n 20 - return 1 - fi - return 0 - fi - ;; /usr/share/locale/*/LC_MESSAGES/*.mo|/usr/share/locale-bundle/*/LC_MESSAGES/*.mo) for f in old/$file new/$file; do sed -i -e "s,POT-Creation-Date: ....-..-.. ..:..+....,POT-Creation-Date: 1970-01-01 00:00+0000," $f @@ -354,8 +339,6 @@ check_single_file() sed -i -e 's|^ *This document was generated by Autobuild on .*, 20.. using texi2html .\....$| This document was generated by Autobuild on August 7, 2009 using texi2html 1.82.|' $f # doxygen docu, e.g. in libssh and log4c sed -i -e 's|Generated on ... ... [0-9]* [0-9]*:[0-9][0-9]:[0-9][0-9] 20[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |' $f - # Generated on Sat Aug 14 2010 16:49:48 for libssh - sed -i -e 's|Generated on ... ... [0-9]* 20[0-9][0-9] [0-9]*:[0-9][0-9]:[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |' $f done ;; /usr/share/javadoc/*.html |\ From 505fee635c9e0f697dbfa333567d85c19f518efb20e8f3dd7aceb74988711e94 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 30 Aug 2010 10:44:04 +0000 Subject: [PATCH 5/5] Updating link to change in openSUSE:Factory/build-compare revision 35.0 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=09c358bb38999e59841f500573da91c6 --- build-compare.changes | 10 ++++++++++ build-compare.spec | 2 +- rpm-check.sh | 17 +++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/build-compare.changes b/build-compare.changes index 01f454d..88e95e0 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Aug 27 08:59:22 UTC 2010 - aj@suse.de + +- Handle png files with timestamp if convert is installed. + +------------------------------------------------------------------- +Fri Aug 27 06:50:13 UTC 2010 - aj@suse.de + +- Handle one more doxygen variation. + ------------------------------------------------------------------- Sun May 23 12:19:56 UTC 2010 - aj@suse.de diff --git a/build-compare.spec b/build-compare.spec index 5d6a421..93ea105 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -24,7 +24,7 @@ Group: Development/Tools/Building AutoReqProv: on Summary: Build Result Compare Script Version: 2009.10.14 -Release: 14 +Release: 19 Source: same-build-result.sh Source1: rpm-check.sh Source2: COPYING diff --git a/rpm-check.sh b/rpm-check.sh index b80f9aa..48306ed 100644 --- a/rpm-check.sh +++ b/rpm-check.sh @@ -327,6 +327,21 @@ check_single_file() check_single_file ${file/.gz/} return $? ;; + *png) + # Try to remove timestamps, only if convert from ImageMagick is installed + if [[ $(type -p convert) ]]; then + convert old/$file +set date:create +set date:modify old/${file/.png/_n.png} + convert old/$file +set date:create +set date:modify new/${file/.png/_n.png} + if ! cmp -s old/${file/.png/_n.png} new/${file/.png/_n.png}; then + echo "$file differs ($ftype)" + hexdump -C old/${file/.png/_n.png} > $file1 + hexdump -C new/${file/.png/_n.png} > $file2 + diff -u $file1 $file2 | head -n 20 + return 1 + fi + return 0 + fi + ;; /usr/share/locale/*/LC_MESSAGES/*.mo|/usr/share/locale-bundle/*/LC_MESSAGES/*.mo) for f in old/$file new/$file; do sed -i -e "s,POT-Creation-Date: ....-..-.. ..:..+....,POT-Creation-Date: 1970-01-01 00:00+0000," $f @@ -339,6 +354,8 @@ check_single_file() sed -i -e 's|^ *This document was generated by Autobuild on .*, 20.. using texi2html .\....$| This document was generated by Autobuild on August 7, 2009 using texi2html 1.82.|' $f # doxygen docu, e.g. in libssh and log4c sed -i -e 's|Generated on ... ... [0-9]* [0-9]*:[0-9][0-9]:[0-9][0-9] 20[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |' $f + # Generated on Sat Aug 14 2010 16:49:48 for libssh + sed -i -e 's|Generated on ... ... [0-9]* 20[0-9][0-9] [0-9]*:[0-9][0-9]:[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |' $f done ;; /usr/share/javadoc/*.html |\