From e9ca6692f7223426454d3aaf81ed52f9669d17384862f8fa853c8e7c145e2629 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 12 May 2010 08:54:49 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/build-compare revision 28.0 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=aae048e3cacd33adfd60f823eee89350 --- build-compare.changes | 25 +++++++++++++++++++++++++ build-compare.spec | 2 +- rpm-check.sh | 35 +++++++++++++++++++++++++++++------ 3 files changed, 55 insertions(+), 7 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 8d066e9..d750bff 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Tue May 11 12:51:51 UTC 2010 - aj@suse.de + +- Improve kde index.cache handling as suggested by Cristian Morales + Vega in bnc#604049. + +------------------------------------------------------------------- +Tue May 11 07:12:09 UTC 2010 - aj@suse.de + +- Handle deprecated-list.html generated by javadoc. +- Handle doxygen docu. +- Handle /etc/sendmail.cf as well. +- Improve texi2html regexp to handle qemu. + +------------------------------------------------------------------- +Mon May 10 12:27:16 UTC 2010 - aj@suse.de + +- Handle kde index.cache files (bnc#604049). +- Fix for handling of man pages and javadoc files. + +------------------------------------------------------------------- +Mon May 10 09:13:38 UTC 2010 - aj@suse.de + +- Handle kdelibs4 + ------------------------------------------------------------------- Sat May 8 19:41:30 UTC 2010 - aj@suse.de diff --git a/build-compare.spec b/build-compare.spec index 76620c3..529a05d 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: 9 +Release: 10 Source: same-build-result.sh Source1: rpm-check.sh Source2: COPYING diff --git a/rpm-check.sh b/rpm-check.sh index 6e7a2a9..b9b4293 100644 --- a/rpm-check.sh +++ b/rpm-check.sh @@ -333,22 +333,29 @@ check_single_file() done ;; /usr/share/doc/packages/*/*.html) - # texi2html output, e.g. in kvm, indent + # texi2html output, e.g. in kvm, indent, qemu for f in old/$file new/$file; do sed -i -e "s|^,^," $f + sed -i -e "s,^,^," $f sed -i -e 's|^$||' $f sed -i -e 's|||' $f # Gjdoc HtmlDoclet: sed -i -e 's%Generated by Gjdoc HtmlDoclet [0-9,.]*, part of GNU Classpath Tools, on .*, 20.. [0-9]*:..:.. \(a\|p\)\.m\. GMT.%Generated by Gjdoc.%' $f sed -i -e 's%, on [A-Z][a-z]* [0-9]*, 20?? [0-9]*:??:?? \(a|p\)\.m\. GMT.

%, on January 1, 2009 0:00:00 a.m. GMT.

%' $f + # deprecated-list is randomly ordered, sort it for comparison + case $f in + */deprecated-list.html) + sort $f > ${f}.sort + mv ${f}.sort $f + ;; + esac done ;; /usr/share/javadoc/*/gjdoc.properties) @@ -356,6 +363,12 @@ check_single_file() sed -i -e 's|^#[A-Z][a-z]\{2\} [A-Z][a-z]\{2\} [0-9]\{2\} ..:..:.. GMT 20..$|#Fri Jan 01 11:27:36 GMT 2009|' $f done ;; + /usr/share/doc/packages/*/html/*.html) + # doxygen docu, e.g. in libssh + for f in old/$file new/$file; do + 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 + done + ;; */fonts.scale|*/fonts.dir|*/encodings.dir) for f in old/$file new/$file; do # sort files before comparing @@ -379,8 +392,10 @@ check_single_file() # .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" # .TH QEMU-IMG 1 "2010-03-14" " " " " + # .TH kdecmake 1 "May 07, 2010" "cmake 2.8.1" for f in old/$file new/$file; do - sed -i -e 's|^\.TH \(.*\) \([0-9]\) \("20..-..-.."\|20..-..-..\|"[A-Z][a-z]* [0-9][0-9], 20[0-9][0-9]"\) |.TH \1 \2 "2000-01-01" |' $f + sed -i -e 's|^\.TH \(.*\) \([0-9]\) \("20..-..-.."\|20..-..-..\) |.TH \1 \2 "2000-01-01" |' $f + sed -i -e 's|^\.TH \(.*\) \([0-9]\) "[A-Z][a-z]* [0-9][0-9], 20[0-9][0-9]" |.TH \1 \2 "2000-01-01" |' $f done ;; *.elc) @@ -410,13 +425,21 @@ check_single_file() sed -i -e 's|^# Libtool was configured on host [a-z0-9]*:$|Libtool was configured on host x42:|' $f done ;; - /etc/mail/*cf) + /etc/mail/*cf|/etc/sendmail.cf) # from sendmail package for f in old/$file new/$file; do # - ##### built by abuild@build33 on Thu May 6 11:21:17 UTC 2010 - sed -i -e 's|built by abuild@[a-z0-9]* on ... ... [0-9]* [0-9]*:[0-9][0-9]:[0-9][0-9] .* 20[0-9][0-9]|built by abuild@build42 on Thu May 6 11:21:17 UTC 2010|'; $f + sed -i -e 's|built by abuild@[a-z0-9]* on ... ... [0-9]* [0-9]*:[0-9][0-9]:[0-9][0-9] .* 20[0-9][0-9]|built by abuild@build42 on Thu May 6 11:21:17 UTC 2010|' $f done ;; + /usr/share/doc/kde/HTML/*/*/index.cache|/usr/share/doc/kde/HTML/*/*/*/index.cache) + # various kde packages + for f in old/$file new/$file; do + sed -i -e 's|||g' $f + sed -i -e 's|\.html#id[0-9]*">|.html#id424242">|g' $f + done + ;; + esac ftype=`/usr/bin/file old/$file | cut -d: -f2-`