From 6dd204e411218b6f1ad6258a24ed14802f175a1b0e8eb9f7f50077aa5a7fbf30 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger
Date: Wed, 18 Nov 2009 06:49:23 +0000
Subject: [PATCH 1/3] Accepting request 24618 from
home:a_jaeger:branches:openSUSE:Factory
Copy from home:a_jaeger:branches:openSUSE:Factory/build-compare via accept of submit request 24618 revision 29.
Request was accepted with message:
Thanks.
OBS-URL: https://build.opensuse.org/request/show/24618
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=44
---
build-compare.changes | 5 +++++
rpm-check.sh | 8 +++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/build-compare.changes b/build-compare.changes
index c3b462b..c124762 100644
--- a/build-compare.changes
+++ b/build-compare.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Nov 18 06:48:27 UTC 2009 - aj@suse.de
+
+- Some more gjdoc dates (found in ant-antlr).
+
-------------------------------------------------------------------
Thu Oct 22 09:03:46 UTC 2009 - coolo@novell.com
diff --git a/rpm-check.sh b/rpm-check.sh
index 2d57fe7..4a5b92e 100644
--- a/rpm-check.sh
+++ b/rpm-check.sh
@@ -350,7 +350,13 @@ check_single_file()
sed -i -e 's|^$||' $f
sed -i -e 's|||' $f
# Gjdoc HtmlDoclet:
- sed -i -e 's|Generated by Gjdoc HtmlDoclet 0...., part of GNU Classpath Tools, on .*, 20.. ..:..:.. ..m. GMT.|Generated by Gjdoc.|' $f
+ 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
+ done
+ ;;
+ /usr/share/javadoc/*/gjdoc.properties)
+ for f in old/$file new/$file; do
+ 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
;;
*/fonts.scale|*/fonts.dir|*/encodings.dir)
From 0b78a50c2e9f4b0ffd3a015c24d20b9c61a4a7fbf0e980d5b92bc08183341ce8 Mon Sep 17 00:00:00 2001
From: OBS User autobuild
Date: Wed, 18 Nov 2009 11:04:46 +0000
Subject: [PATCH 2/3] checked in
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=45
---
build-compare.changes | 5 -----
rpm-check.sh | 8 +-------
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/build-compare.changes b/build-compare.changes
index c124762..c3b462b 100644
--- a/build-compare.changes
+++ b/build-compare.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Wed Nov 18 06:48:27 UTC 2009 - aj@suse.de
-
-- Some more gjdoc dates (found in ant-antlr).
-
-------------------------------------------------------------------
Thu Oct 22 09:03:46 UTC 2009 - coolo@novell.com
diff --git a/rpm-check.sh b/rpm-check.sh
index 4a5b92e..2d57fe7 100644
--- a/rpm-check.sh
+++ b/rpm-check.sh
@@ -350,13 +350,7 @@ check_single_file()
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
- done
- ;;
- /usr/share/javadoc/*/gjdoc.properties)
- for f in old/$file new/$file; do
- 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
+ sed -i -e 's|Generated by Gjdoc HtmlDoclet 0...., part of GNU Classpath Tools, on .*, 20.. ..:..:.. ..m. GMT.|Generated by Gjdoc.|' $f
done
;;
*/fonts.scale|*/fonts.dir|*/encodings.dir)
From 11394fd2f11b5d9a4c47c9e0ab80dd7d02c28b6d4864a116e6b8d35edaa7e3af Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit
Date: Wed, 18 Nov 2009 11:04:47 +0000
Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/build-compare
revision 20.0
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=06645d126e60a8b65bc342470541c3c8
---
build-compare.changes | 5 +++++
build-compare.spec | 2 +-
rpm-check.sh | 8 +++++++-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/build-compare.changes b/build-compare.changes
index c3b462b..c124762 100644
--- a/build-compare.changes
+++ b/build-compare.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Nov 18 06:48:27 UTC 2009 - aj@suse.de
+
+- Some more gjdoc dates (found in ant-antlr).
+
-------------------------------------------------------------------
Thu Oct 22 09:03:46 UTC 2009 - coolo@novell.com
diff --git a/build-compare.spec b/build-compare.spec
index 58b2c01..6938db1 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: 2
+Release: 3
Source: same-build-result.sh
Source1: rpm-check.sh
Source2: COPYING
diff --git a/rpm-check.sh b/rpm-check.sh
index 2d57fe7..4a5b92e 100644
--- a/rpm-check.sh
+++ b/rpm-check.sh
@@ -350,7 +350,13 @@ check_single_file()
sed -i -e 's|^$||' $f
sed -i -e 's|||' $f
# Gjdoc HtmlDoclet:
- sed -i -e 's|Generated by Gjdoc HtmlDoclet 0...., part of GNU Classpath Tools, on .*, 20.. ..:..:.. ..m. GMT.|Generated by Gjdoc.|' $f
+ 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
+ done
+ ;;
+ /usr/share/javadoc/*/gjdoc.properties)
+ for f in old/$file new/$file; do
+ 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
;;
*/fonts.scale|*/fonts.dir|*/encodings.dir)