From 560004f8083d2cda25365e1e09c4affc10ed1e2e0cddf7af3b59c0aa1516cc36 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Wed, 12 May 2010 08:54:48 +0000
Subject: [PATCH] Accepting request 39825 from openSUSE:Tools
checked in (request 39825)
OBS-URL: https://build.opensuse.org/request/show/39825
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=64
---
build-compare.changes | 25 -------------------------
rpm-check.sh | 35 ++++++-----------------------------
2 files changed, 6 insertions(+), 54 deletions(-)
diff --git a/build-compare.changes b/build-compare.changes
index d750bff..8d066e9 100644
--- a/build-compare.changes
+++ b/build-compare.changes
@@ -1,28 +1,3 @@
--------------------------------------------------------------------
-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/rpm-check.sh b/rpm-check.sh
index b9b4293..6e7a2a9 100644
--- a/rpm-check.sh
+++ b/rpm-check.sh
@@ -333,29 +333,22 @@ check_single_file()
done
;;
/usr/share/doc/packages/*/*.html)
- # texi2html output, e.g. in kvm, indent, qemu
+ # texi2html output, e.g. in kvm, indent
for f in old/$file new/$file; do
sed -i -e "s|^<!-- Created on .*, 20.. by texi2html .\...$|<!-- Created on August 7, 2009 by texi2html 1.82|" $f
- sed -i -e 's|^ *This document was generated by <em>Autobuild</em> on <em>.*, 20..</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html .\...</em></a>.$| This document was generated by <em>Autobuild</em> on <em>August 7, 2009</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html 1.82</em></a>.|' $f
+ sed -i -e 's|^ This document was generated by <em>Autobuild</em> on <em>.*, 20..</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html .\...</em></a>.$| This document was generated by <em>Autobuild</em> on <em>August 7, 2009</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html 1.82</em></a>.|' $f
done
;;
/usr/share/javadoc/*/*.html|/usr/share/javadoc/*/*/*.html)
# There are more timestamps in html, so far we handle only some primitive versions.
for f in old/$file new/$file; do
# Javadoc:
- sed -i -e "s,^<!-- Generated by javadoc (build [0-9._]*) on ... ... .. ..:..:.. UTC .... -->,^<!-- Generated by javadoc (build 1.6.0_0) on Sun Jul 01 00:00:00 UTC 2000 -->," $f
+ sed -i -e "s,^<!-- Generated by javadoc (build .......) on ... ... .. ..:..:.. UTC .... -->,^<!-- Generated by javadoc (build 1.6.0_0) on Sun Jul 01 00:00:00 UTC 2000 -->," $f
sed -i -e 's|^<!-- Generated by javadoc on ... ... .. ..:..:.. UTC ....-->$|<!-- Generated by javadoc on Sun Jul 01 00:00:00 UTC 2000-->|' $f
sed -i -e 's|<META NAME="date" CONTENT="20..-..-..">|<META NAME="date" CONTENT="1970-01-01">|' $f
# Gjdoc HtmlDoclet:
sed -i -e 's%Generated by Gjdoc HtmlDoclet [0-9,.]*, part of <a href="http://www.gnu.org/software/classpath/cp-tools/" title="" target="_top">GNU Classpath Tools</a>, on .*, 20.. [0-9]*:..:.. \(a\|p\)\.m\. GMT.%Generated by Gjdoc.%' $f
sed -i -e 's%<!DOCTYPE html PUBLIC "-//gnu.org///DTD XHTML 1.1 plus Target 1.0//EN"\(.*\)GNU Classpath Tools</a>, on [A-Z][a-z]* [0-9]*, 20?? [0-9]*:??:?? \(a|p\)\.m\. GMT.</p>%<!DOCTYPE html PUBLIC "-//gnu.org///DTD XHTML 1.1 plus Target 1.0//EN"\1GNU Classpath Tools</a>, on January 1, 2009 0:00:00 a.m. GMT.</p>%' $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)
@@ -363,12 +356,6 @@ 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
@@ -392,10 +379,8 @@ 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..-..-..\) |.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
+ 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
done
;;
*.elc)
@@ -425,21 +410,13 @@ 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/sendmail.cf)
+ /etc/mail/*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|<a name="id[0-9]*">|<a name="id424242">|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-`