From 1604b82501fb5d2f568d3ec8d3de4f6ee3a9db06176a9b936bce43b114d18653 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 23 Mar 2016 07:34:05 +0000 Subject: [PATCH 1/5] - Ignore checksums in ruby checksums.yaml (bnc#916047) OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=207 --- build-compare.changes | 5 +++++ build-compare.spec | 4 +++- pkg-diff.sh | 11 +++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/build-compare.changes b/build-compare.changes index 83f134e..7908e83 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 23 07:31:09 UTC 2016 - olaf@aepfle.de + +- Ignore checksums in ruby checksums.yaml (bnc#916047) + ------------------------------------------------------------------- Tue Mar 8 18:00:40 UTC 2016 - olaf@aepfle.de diff --git a/build-compare.spec b/build-compare.spec index 8b61203..ac25057 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -16,12 +16,14 @@ # +%define version_unconverted 20160323T083206.9c58265 + Name: build-compare Summary: Build Result Compare Script License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/build-compare -Version: 20160308T194108.4a952dd +Version: 20160323T083206.9c58265 Release: 0 Source1: COPYING Source2: same-build-result.sh diff --git a/pkg-diff.sh b/pkg-diff.sh index f100be0..8d1215f 100644 --- a/pkg-diff.sh +++ b/pkg-diff.sh @@ -695,6 +695,17 @@ check_single_file() sed -i '/^InitrdID:/s@^.*@InitrdID: something@' "old/$file" sed -i '/^InitrdID:/s@^.*@InitrdID: something@' "new/$file" ;; + /usr/lib*/ruby/gems/*/cache/checksums.yaml) + for f in "old/$file" "new/$file" + do + sed -i ' + s/^\( metadata.gz:\) \([a-z0-9]\{40\}\)$/\1 metadata_sha1_sum/ + s/^\( data.tar.gz:\) \([a-z0-9]\{40\}\)$/\1 data.tar_sha1_sum/ + s/^\( metadata.gz:\) \([a-z0-9]\{128\}\)$/\1 metadata_sha512_sum/ + s/^\( data.tar.gz:\) \([a-z0-9]\{128\}\)$/\1 data.tar_sha512_sum/ + ' "$f" + done + ;; esac ftype=`/usr/bin/file old/$file | sed 's@^[^:]\+:[[:blank:]]*@@'` From 82d3060d19ca2aa3dd36db314b3b73369df39f2dc018ed93c4b19b64710ae657 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 23 Mar 2016 11:33:15 +0000 Subject: [PATCH 2/5] Revert "Ignore checksums in ruby checksums.yaml" OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=208 --- build-compare.changes | 5 ----- build-compare.spec | 4 ++-- pkg-diff.sh | 11 ----------- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 7908e83..83f134e 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Mar 23 07:31:09 UTC 2016 - olaf@aepfle.de - -- Ignore checksums in ruby checksums.yaml (bnc#916047) - ------------------------------------------------------------------- Tue Mar 8 18:00:40 UTC 2016 - olaf@aepfle.de diff --git a/build-compare.spec b/build-compare.spec index ac25057..8e16b82 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -16,14 +16,14 @@ # -%define version_unconverted 20160323T083206.9c58265 +%define version_unconverted 20160323T093838.30201bd Name: build-compare Summary: Build Result Compare Script License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/build-compare -Version: 20160323T083206.9c58265 +Version: 20160323T093838.30201bd Release: 0 Source1: COPYING Source2: same-build-result.sh diff --git a/pkg-diff.sh b/pkg-diff.sh index 8d1215f..f100be0 100644 --- a/pkg-diff.sh +++ b/pkg-diff.sh @@ -695,17 +695,6 @@ check_single_file() sed -i '/^InitrdID:/s@^.*@InitrdID: something@' "old/$file" sed -i '/^InitrdID:/s@^.*@InitrdID: something@' "new/$file" ;; - /usr/lib*/ruby/gems/*/cache/checksums.yaml) - for f in "old/$file" "new/$file" - do - sed -i ' - s/^\( metadata.gz:\) \([a-z0-9]\{40\}\)$/\1 metadata_sha1_sum/ - s/^\( data.tar.gz:\) \([a-z0-9]\{40\}\)$/\1 data.tar_sha1_sum/ - s/^\( metadata.gz:\) \([a-z0-9]\{128\}\)$/\1 metadata_sha512_sum/ - s/^\( data.tar.gz:\) \([a-z0-9]\{128\}\)$/\1 data.tar_sha512_sum/ - ' "$f" - done - ;; esac ftype=`/usr/bin/file old/$file | sed 's@^[^:]\+:[[:blank:]]*@@'` From a0a7653793bc364d260bfc3b0148ea0ee10c1529489a04f6cf1ba9f7c2064fc3 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 6 Apr 2016 07:12:31 +0000 Subject: [PATCH 3/5] - the buildroot lost awk, add used utilities to Requires OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=209 --- build-compare.changes | 5 +++++ build-compare.spec | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 83f134e..83bca0d 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 6 07:06:58 UTC 2016 - olaf@aepfle.de + +- the buildroot lost awk, add used utilities to Requires + ------------------------------------------------------------------- Tue Mar 8 18:00:40 UTC 2016 - olaf@aepfle.de diff --git a/build-compare.spec b/build-compare.spec index 8e16b82..c9ccc78 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -16,20 +16,30 @@ # -%define version_unconverted 20160323T093838.30201bd +%define version_unconverted 20160406T090755.b2a1cb1 Name: build-compare Summary: Build Result Compare Script License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/build-compare -Version: 20160323T093838.30201bd +Version: 20160406T090755.b2a1cb1 Release: 0 Source1: COPYING Source2: same-build-result.sh Source3: pkg-diff.sh Source4: functions.sh Source5: srpm-check.sh +%if 0%{suse_version} +Requires: bash +Requires: coreutils +Requires: diffutils +Requires: file +Requires: gawk +Requires: grep +Requires: rpm +Requires: sed +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch #!BuildIgnore: build-compare From 0924517a070ecbb8fa4e59f190571fcb0b41e46b89cc9ec82a6ac471f779eec8 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 6 Apr 2016 07:18:23 +0000 Subject: [PATCH 4/5] Fix if suse_version syntax OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=210 --- build-compare.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-compare.spec b/build-compare.spec index c9ccc78..f79f0de 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -16,21 +16,21 @@ # -%define version_unconverted 20160406T090755.b2a1cb1 +%define version_unconverted 20160406T091741.0e568e2 Name: build-compare Summary: Build Result Compare Script License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/build-compare -Version: 20160406T090755.b2a1cb1 +Version: 20160406T091741.0e568e2 Release: 0 Source1: COPYING Source2: same-build-result.sh Source3: pkg-diff.sh Source4: functions.sh Source5: srpm-check.sh -%if 0%{suse_version} +%if 0%{?suse_version} Requires: bash Requires: coreutils Requires: diffutils From 3866a3faffc00e522570a0780d71d2340939690ad7f1f54212a94e5e943b503e Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 6 Apr 2016 13:58:04 +0000 Subject: [PATCH 5/5] Adjust changes file OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=211 --- build-compare.changes | 2 +- build-compare.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 83bca0d..9c3e21c 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Wed Apr 6 07:06:58 UTC 2016 - olaf@aepfle.de -- the buildroot lost awk, add used utilities to Requires +- add used utilities to Requires ------------------------------------------------------------------- Tue Mar 8 18:00:40 UTC 2016 - olaf@aepfle.de diff --git a/build-compare.spec b/build-compare.spec index f79f0de..8fe757f 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -16,14 +16,14 @@ # -%define version_unconverted 20160406T091741.0e568e2 +%define version_unconverted 20160406T155640.b74db7f Name: build-compare Summary: Build Result Compare Script License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/build-compare -Version: 20160406T091741.0e568e2 +Version: 20160406T155640.b74db7f Release: 0 Source1: COPYING Source2: same-build-result.sh