From 1af7e1ca47ddfae97e678154767a3b598692dd9bfc3f314ee9f68cb17043d12d Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 1 Jul 2019 09:49:31 +0000 Subject: [PATCH] Accepting request 710826 from home:marxin:branches:Base:System - Add 0001-Remove-brp-75-ar-for-now.patch in order to temporarily disable the check. OBS-URL: https://build.opensuse.org/request/show/710826 OBS-URL: https://build.opensuse.org/package/show/Base:System/brp-check-suse?expand=0&rev=75 --- 0001-Remove-brp-75-ar-for-now.patch | 33 +++++++++++++++++++++++++++++ brp-check-suse.changes | 6 ++++++ brp-check-suse.spec | 2 ++ 3 files changed, 41 insertions(+) create mode 100644 0001-Remove-brp-75-ar-for-now.patch 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/brp-check-suse.changes b/brp-check-suse.changes index e64c322..1df7cfb 100644 --- a/brp-check-suse.changes +++ b/brp-check-suse.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/brp-check-suse.spec b/brp-check-suse.spec index b5744ce..7245c73 100644 --- a/brp-check-suse.spec +++ b/brp-check-suse.spec @@ -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