diff --git a/build-compare.changes b/build-compare.changes index 70954b3..417aa7e 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Aug 4 08:05:22 CEST 2009 - aj@suse.de + +- Compare mono files with cmp, just in case (handles rfc). + +------------------------------------------------------------------- +Sun Aug 2 07:15:45 CEST 2009 - aj@suse.de + +- Sort jar filelists before compare. + ------------------------------------------------------------------- Mon Jul 27 10:36:49 CEST 2009 - aj@suse.de diff --git a/build-compare.spec b/build-compare.spec index 8af4c00..ffd751e 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -1,5 +1,5 @@ # -# spec file for package build-compare (Version 2009.07.27) +# spec file for package build-compare (Version 2009.08.04) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ License: GPL v2 or later Group: Development/Tools/Building AutoReqProv: on Summary: Build Result Compare Script -Version: 2009.07.27 +Version: 2009.08.04 Release: 1 Source: same-build-result.sh Source1: rpm-check.sh diff --git a/rpm-check.sh b/rpm-check.sh index 523471d..7c92df1 100644 --- a/rpm-check.sh +++ b/rpm-check.sh @@ -234,8 +234,12 @@ check_single_file() ;; *.dll|*.exe) # we can't handle it well enough - echo "mono files unhandled ($file)" - return 1;; + 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` @@ -275,10 +279,10 @@ check_single_file() ;; *.zip|*.jar) cd old - unjar_l ./$file > flist + 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 cd ../new - unjar_l ./$file > flist + 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 cd .. if ! cmp -s old/flist new/flist; then