- move license to licensedir

- spec file cleanups

- fix compatibility with older sed (#55)

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=298
This commit is contained in:
Olaf Hering 2022-09-26 09:56:50 +00:00 committed by Git OBS Bridge
parent cd42f5af6c
commit d3bb2bf8b1
3 changed files with 32 additions and 18 deletions

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Sep 19 08:02:40 UTC 2022 - Dirk Müller <dmueller@suse.com>
- move license to licensedir
- spec file cleanups
-------------------------------------------------------------------
Fri Sep 2 07:15:18 UTC 2022 - Martin Kampas <martin.kampas@jolla.com>
- fix compatibility with older sed (#55)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 23 06:53:29 UTC 2022 - Martin Kampas <martin.kampas@jolla.com> Tue Aug 23 06:53:29 UTC 2022 - Martin Kampas <martin.kampas@jolla.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package build-compare # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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 Name: build-compare
Summary: Build Result Compare Script Version: 20220926T095347.40c240f
License: GPL-2.0+
Group: Development/Tools/Building
Url: https://github.com/openSUSE/build-compare
Version: 20220823T100012.86340a1
Release: 0 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 Source1: COPYING
Source2: same-build-result.sh Source2: same-build-result.sh
Source3: pkg-diff.sh Source3: pkg-diff.sh
Source4: functions.sh Source4: functions.sh
Source5: srpm-check.sh Source5: srpm-check.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!BuildIgnore: build-compare
BuildArch: noarch
%if 0%{?suse_version} %if 0%{?suse_version}
Requires: bash Requires: bash
Requires: cpio
Requires: coreutils Requires: coreutils
Requires: cpio
Requires: diffutils Requires: diffutils
Requires: file Requires: file
Requires: gawk Requires: gawk
@ -39,28 +42,28 @@ Requires: grep
Requires: rpm Requires: rpm
Requires: sed Requires: sed
%endif %endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
#!BuildIgnore: build-compare
%description %description
This package contains scripts to find out if the build result differs This package contains scripts to find out if the build result differs
to a former build. to a former build.
%prep %prep
%setup -q -c -T %setup -q -c -T
install -p -m 0644 %{SOURCE1} .
%build %build
%install %install
mkdir -p $RPM_BUILD_ROOT/usr/lib/build/ $RPM_BUILD_ROOT/%_defaultdocdir/%name mkdir -p %{buildroot}%{_prefix}/lib/build/
install -m 0755 %SOURCE2 %SOURCE3 %SOURCE4 %SOURCE5 $RPM_BUILD_ROOT/usr/lib/build/ install -m 0755 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{buildroot}%{_prefix}/lib/build/
install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/%_defaultdocdir/%name/
%files %files
%if 0%{?suse_version} < 1500
%defattr(-,root,root) %defattr(-,root,root)
%doc %_defaultdocdir/%name %doc COPYING
/usr/lib/build %else
%license COPYING
%endif
%{_prefix}/lib/build
%changelog %changelog

View File

@ -404,7 +404,7 @@ function cmp_rpm_meta ()
do do
: "${REPLY}" : "${REPLY}"
files+=( "${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 fi
if test -n "$sh"; then if test -n "$sh"; then