From ab6eb24f60c31f67e1ac63000dc29e576b58c6a05e307d69718d8cf1648fdb1f Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 24 Oct 2010 11:53:03 +0000 Subject: [PATCH] Accepting request 51318 from home:a_jaeger:branches:build-compare-test ok OBS-URL: https://build.opensuse.org/request/show/51318 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=87 --- build-compare.changes | 6 ++++++ rpm-check.sh | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index a1efbc5..73cd70f 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 22 18:27:48 UTC 2010 - aj@suse.de + +- Handle new zip date. +- Handle heartbeat man page. + ------------------------------------------------------------------- Sun Sep 26 10:03:25 UTC 2010 - aj@suse.de diff --git a/rpm-check.sh b/rpm-check.sh index 2af1cfa..2cf94ef 100644 --- a/rpm-check.sh +++ b/rpm-check.sh @@ -188,10 +188,11 @@ check_single_file() *.zip|*.jar) cd old unjar_l ./$file |sort > flist - sed -i -e "s, [0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9] , date ," flist + # 10-05-2010 14:39 + sed -i -e "s, [0-9][0-9]-[0-9][0-9]-[0-9]\+ [0-9][0-9]:[0-9][0-9] , date ," flist cd ../new unjar_l ./$file |sort> flist - sed -i -e "s, [0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9] , date ,; " flist + sed -i -e "s, [0-9][0-9]-[0-9][0-9]-[0-9]\+ [0-9][0-9]:[0-9][0-9] , date ,; " flist cd .. if ! cmp -s old/flist new/flist; then echo "$file has different file list" @@ -319,9 +320,12 @@ check_single_file() # .TH gv 3guile "13 May 2010" # .TH ARCH "1" "September 2010" "GNU coreutils 8.5" "User Commands" #.TH "GIT\-ARCHIMPORT" "1" "09/13/2010" "Git 1\&.7\&.1" "Git Manual" + # .TH LDIRECTORD 8 "2010-10-20" "perl v5.12.2" "User Contributed Perl Documentation" + for f in old/$file new/$file; do sed -i -e 's|.TH "\?\([^ "]*\)"\? "\?\([0-9][a-z]*\)"\? "\?\(20[0-9][0-9]-[0-9][0-9]-[0-9][0-9]\|[A-Z][a-z]* [0-9][0-9], 20[0-9][0-9]\|[0-9]* [A-Z][a-z]* 20[0-9][0-9]\|[A-Z][a-z][a-z] [A-Z][a-z][a-z] [0-9]\+ 20[0-9][0-9]\|[A-Z][a-z]* 20[0-9][0-9]\)"\? |.TH \1 \2 "2000-01-01" |' $f sed -i -e 's|.TH "\?\([^ "]*\)"\? "\?\([0-9][a-z]*\)"\? "\?\([0-1][0-9]/[0-9][0-9]/201[0-9]\)"\? |.TH \1 \2 "2000-01-01" |' $f + sed -i -e 's|.TH \(.*\) "\?\(20[0-1][0-9]-[0-9][0-9]-[0-9][0-9]\)"\? |.TH \1 "2000-01-01" |' $f # generated by docbook xml: #.\" Date: 09/13/2010 sed -i -e 's|Date: [0-1][0-9]/[0-9][0-9]/201[0-9]|Date: 09/13/2010|' $f