diff --git a/0001-Remove-brp-75-ar-for-now.patch b/0001-Remove-brp-75-ar-for-now.patch new file mode 100644 index 0000000..94542f0 --- /dev/null +++ b/0001-Remove-brp-75-ar-for-now.patch @@ -0,0 +1,33 @@ +From c40244e7026bfdf1a9379542db03b12f2850f061 Mon Sep 17 00:00:00 2001 +From: Martin Liska +Date: Tue, 18 Jun 2019 10:45:09 +0200 +Subject: [PATCH] Remove brp-75-ar for now. + +--- + brp-75-ar | 14 -------------- + 1 file changed, 14 deletions(-) + delete mode 100755 brp-75-ar + +diff --git a/brp-75-ar b/brp-75-ar +deleted file mode 100755 +index 3b852ac..0000000 +--- a/brp-75-ar ++++ /dev/null +@@ -1,14 +0,0 @@ +-#!/bin/bash +-# If using normal root, avoid changing anything. +-if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then +- echo "RPM_BUILD_ROOT is not set or set to / : skipping ar normalization" +- exit 0 +-fi +-if [ -z "$SOURCE_DATE_EPOCH" ] ; then +- echo "SOURCE_DATE_EPOCH is not set: skipping ar normalization" +- exit 0 +-fi +- +-while read f; do +- ! file "$f" | grep -q "ar archive" || objcopy -D "$f" || true +-done < <(find "$RPM_BUILD_ROOT" -type f -name "*.a" -print) +-- +2.21.0 + diff --git a/_servicedata b/_servicedata index 7f41a93..28cf5dc 100644 --- a/_servicedata +++ b/_servicedata @@ -1,5 +1,5 @@ git://github.com/openSUSE/brp-check-suse.git - 224b37ddbcb79dc12b0932cd7341b801d38cb0f0 - \ No newline at end of file + d0bda31734c8721815c6ba99000e98659b78aa66 + diff --git a/brp-check-suse-84.87+git20181106.224b37d.tar.xz b/brp-check-suse-84.87+git20181106.224b37d.tar.xz deleted file mode 100644 index 1d899d1..0000000 --- a/brp-check-suse-84.87+git20181106.224b37d.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4b786e3b1968a8d164cf6aaa288cccc5c9be69462fec47de213c1bce2191246 -size 64960 diff --git a/brp-check-suse-84.87+git20190423.d0bda31.tar.xz b/brp-check-suse-84.87+git20190423.d0bda31.tar.xz new file mode 100644 index 0000000..ac58378 --- /dev/null +++ b/brp-check-suse-84.87+git20190423.d0bda31.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d6bcfe5d09c53527b740f0b1560a5d3a692de7c816386906f1fa502c0241987 +size 65072 diff --git a/brp-check-suse.changes b/brp-check-suse.changes index d8b5e1a..91f219c 100644 --- a/brp-check-suse.changes +++ b/brp-check-suse.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Jun 18 08:45:56 UTC 2019 - Martin Liška + +- Add 0001-Remove-brp-75-ar-for-now.patch in order to temporarily + disable the check. + +------------------------------------------------------------------- +Tue Apr 23 11:23:58 UTC 2019 - Martin Liška + +- Update to version 84.87+git20190423.d0bda31: + * Strip LTO bytecode from static libraries. + * Don't treat Adwaita specially + +------------------------------------------------------------------- +Wed Feb 13 14:25:09 UTC 2019 - opensuse-packaging@opensuse.org + +- Update to version 84.87+git20190213.9c6487b: + * Add brp-75-ar to normalize ar archives + ------------------------------------------------------------------- Tue Nov 06 14:35:26 UTC 2018 - ro@suse.de diff --git a/brp-check-suse.spec b/brp-check-suse.spec index e8230e3..7245c73 100644 --- a/brp-check-suse.spec +++ b/brp-check-suse.spec @@ -1,7 +1,7 @@ # # spec file for package brp-check-suse # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ Summary: Build root policy check scripts License: GPL-2.0-or-later Group: Development/Tools/Building Requires: perl -Version: 84.87+git20181106.224b37d +Version: 84.87+git20190423.d0bda31 Release: 0 Url: https://github.com/openSUSE/brp-check-suse # @@ -31,6 +31,7 @@ Url: https://github.com/openSUSE/brp-check-suse # for inclusion in the git repo at https://github.com/openSUSE/brp-check-suse # Source0: %{name}-%{version}.tar.xz +Patch0: 0001-Remove-brp-75-ar-for-now.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global provfind sh -c "grep -v 'brp-desktop.data' | %__find_provides" %global __find_provides %provfind @@ -42,6 +43,7 @@ build root checking or in parts implemeting SUSE policies. %prep %setup -q +%patch0 -p1 %ifnarch x86_64 s390x ppc64 aarch64 rm brp-65-lib64-linux %endif