pool/pesign-obs-integration
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 694662 from home:gary_lin:branches:Base:System

Browse Source 
Drop 0002-Enable-find_provides-and-requires.patch due to the build failure of virtualbox-guest-x11

OBS-URL: https://build.opensuse.org/request/show/694662
OBS-URL: https://build.opensuse.org/package/show/Base:System/pesign-obs-integration?expand=0&rev=73
This commit is contained in:
Gary Ching-Pang Lin 2019-04-16 04:05:44 +00:00 committed by Git OBS Bridge
parent dd0209890e
commit 98ff0f7ccd
3 changed files with 6 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
0002-Enable-find_provides-and-requires.patch
View File

@ -1,55 +0,0 @@
From 42b934760a75cf077d3c5831aaa14d3d104ba5cd Mon Sep 17 00:00:00 2001
From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
Date: Wed, 3 Apr 2019 05:48:28 +0200
Subject: [PATCH 2/2] Enable find_provides and requires
to get automatic provides instead of manual ones
like the original package did
Without this patch,
rpm -qpv --provides $rpm
differed significantly between OBS build and local osc build.
---
pesign-gen-repackage-spec | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/pesign-gen-repackage-spec b/pesign-gen-repackage-spec
index 9cd374a..61eb8ba 100755
--- a/pesign-gen-repackage-spec
+++ b/pesign-gen-repackage-spec
@@ -246,10 +246,6 @@ sub print_package {
if ($is_main) {
print SPEC "Name: $p->{name}\n";
print SPEC "Buildroot: $directory\n";
- print SPEC "\%define _use_internal_dependency_generator 0\n";
- print SPEC "\%define __find_provides %{nil}\n";
- print SPEC "\%define __find_requires %{nil}\n";
- print SPEC "\%define __find_supplements %{nil}\n";
if ($p->{nosource}) {
# We do not generate any no(src).rpm, but we want the
# %{sourcerpm} tag in the binary packages to match.
@@ -309,14 +305,20 @@ my %depflags = (
"<" => (1 << 1),
">" => (1 << 2),
"=" => (1 << 3),
+ find_requires => (1 << 14),
+ find_provides => (1 << 15),
rpmlib => (1 << 24),
+ config => (1 << 28),
);
sub print_deps {
my ($depname, $list) = @_;
+DEPLOOP:
foreach my $d (@$list) {
- next if ($d->{flags} & $depflags{rpmlib});
+ for my $flag (qw(rpmlib config find_requires find_provides)) {
+ next DEPLOOP if ($d->{flags} & $depflags{$flag});
+ }
print SPEC $depname;
my @deptypes;
--
2.21.0

6
pesign-obs-integration.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Apr 16 03:53:05 UTC 2019 - Gary Ching-Pang Lin <glin@suse.com>
- Drop 0002-Enable-find_provides-and-requires.patch due to the
build failure of virtualbox-guest-x11
-------------------------------------------------------------------
Thu Apr 11 03:45:03 UTC 2019 - Gary Ching-Pang Lin <glin@suse.com>

2
pesign-obs-integration.spec
View File

@ -33,7 +33,6 @@ BuildRequires: openssl
Url: http://en.opensuse.org/openSUSE:UEFI_Image_File_Sign_Tools
Source: %{name}_%{version}.tar.gz
Patch1: 0001-Passthrough-license-tag.patch
Patch2: 0002-Enable-find_provides-and-requires.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# suse-module-tools <= 15.0.10 contains modsign-verify
Requires: suse-module-tools >= 15.0.10
@ -45,7 +44,6 @@ boot loader, kernel and kernel modules in the openSUSE Buildservice.
%prep
%setup -D -n %{name}
%patch1 -p1
%patch2 -p1
%build