Dominique Leuenberger 2019-07-29 15:23:41 +00:00 committed by Git OBS Bridge
commit 64800a5046
6 changed files with 13 additions and 41 deletions

View File

@ -1,33 +0,0 @@
From c40244e7026bfdf1a9379542db03b12f2850f061 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
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

View File

@ -1,5 +1,5 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/openSUSE/brp-check-suse.git</param>
<param name="changesrevision">d0bda31734c8721815c6ba99000e98659b78aa66</param></service>
</servicedata>
<param name="changesrevision">13ed30b788930d5e274740990e83b48d3df454eb</param></service>
</servicedata>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4d6bcfe5d09c53527b740f0b1560a5d3a692de7c816386906f1fa502c0241987
size 65072

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0b820ffd0fbd5e4f9f06681ee330ab92c5b02337ba1fe0888b681b564e2d1fbb
size 65092

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jul 08 13:33:44 UTC 2019 - mliska@suse.cz
- Update to version 84.87+git20190702.bac0cab:
* Add NO_BRP_AR as a way how to skip ar.
- Remove 0001-Remove-brp-75-ar-for-now.patch.
-------------------------------------------------------------------
Tue Jun 18 08:45:56 UTC 2019 - Martin Liška <mliska@suse.cz>

View File

@ -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+git20190423.d0bda31
Version: 84.87+git20190702.bac0cab
Release: 0
Url: https://github.com/openSUSE/brp-check-suse
#
@ -31,7 +31,6 @@ 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
@ -43,7 +42,6 @@ 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