diff --git a/build-compare.changes b/build-compare.changes index 2fa5998..1f5eaa7 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Sep 19 08:02:40 UTC 2022 - Dirk Müller + +- move license to licensedir +- spec file cleanups + +------------------------------------------------------------------- +Fri Sep 2 07:15:18 UTC 2022 - Martin Kampas + +- fix compatibility with older sed (#55) + ------------------------------------------------------------------- Tue Aug 23 06:53:29 UTC 2022 - Martin Kampas diff --git a/build-compare.spec b/build-compare.spec index 43e0ef7..8ca15d1 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -1,7 +1,7 @@ # # spec file for package build-compare # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,26 +12,29 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: build-compare -Summary: Build Result Compare Script -License: GPL-2.0+ -Group: Development/Tools/Building -Url: https://github.com/openSUSE/build-compare -Version: 20220823T100012.86340a1 +Version: 20220926T095347.40c240f Release: 0 +Summary: Build Result Compare Script +License: GPL-2.0-or-later +Group: Development/Tools/Building +URL: https://github.com/openSUSE/build-compare Source1: COPYING Source2: same-build-result.sh Source3: pkg-diff.sh Source4: functions.sh Source5: srpm-check.sh +BuildRoot: %{_tmppath}/%{name}-%{version}-build +#!BuildIgnore: build-compare +BuildArch: noarch %if 0%{?suse_version} Requires: bash -Requires: cpio Requires: coreutils +Requires: cpio Requires: diffutils Requires: file Requires: gawk @@ -39,28 +42,28 @@ Requires: grep Requires: rpm Requires: sed %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch -#!BuildIgnore: build-compare %description This package contains scripts to find out if the build result differs to a former build. - %prep %setup -q -c -T +install -p -m 0644 %{SOURCE1} . %build %install -mkdir -p $RPM_BUILD_ROOT/usr/lib/build/ $RPM_BUILD_ROOT/%_defaultdocdir/%name -install -m 0755 %SOURCE2 %SOURCE3 %SOURCE4 %SOURCE5 $RPM_BUILD_ROOT/usr/lib/build/ -install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/%_defaultdocdir/%name/ +mkdir -p %{buildroot}%{_prefix}/lib/build/ +install -m 0755 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{buildroot}%{_prefix}/lib/build/ %files +%if 0%{?suse_version} < 1500 %defattr(-,root,root) -%doc %_defaultdocdir/%name -/usr/lib/build +%doc COPYING +%else +%license COPYING +%endif +%{_prefix}/lib/build %changelog diff --git a/functions.sh b/functions.sh index 259c3cc..f8e2684 100644 --- a/functions.sh +++ b/functions.sh @@ -404,7 +404,7 @@ function cmp_rpm_meta () do : "${REPLY}" files+=( "${REPLY}" ) - done < <(diff -U0 $file1 $file2 | sed -E -n -e '/^\+\//{s/^\+//;s/ [0-9a-f]+ [0-9]+$//;p}') + done < <(diff -U0 $file1 $file2 | sed --regexp-extended -n -e '/^\+\//{s/^\+//;s/ [0-9a-f]+ [0-9]+$//;p}') fi if test -n "$sh"; then