From b3966de8d8979515a7cbcf5ffac28bafe9903a7db7a271273d0362e496be4d62 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 30 Aug 2010 10:44:03 +0000 Subject: [PATCH] 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 |\