Add support for %missingok as a standalone file attribute

This commit is contained in:
Florian Festi 2016-01-15 15:25:44 +01:00
parent ece6f42375
commit d0fa66b1d4
2 changed files with 29 additions and 1 deletions

View File

@ -0,0 +1,24 @@
From 8efe51e8c24b7739f0bf7680e21083c8964633f5 Mon Sep 17 00:00:00 2001
From: Florian Festi <ffesti@redhat.com>
Date: Fri, 15 Jan 2016 14:32:47 +0100
Subject: [PATCH] Add support for %missingok as a standalone file attribute
---
build/files.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/build/files.c b/build/files.c
index d00a785..2d72633 100644
--- a/build/files.c
+++ b/build/files.c
@@ -783,6 +783,7 @@ static VFA_t const virtualAttrs[] = {
{ "%readme", RPMFILE_README },
{ "%license", RPMFILE_LICENSE },
{ "%pubkey", RPMFILE_PUBKEY },
+ { "%missingok", RPMFILE_MISSINGOK },
{ NULL, 0 }
};
--
2.1.0

View File

@ -29,7 +29,7 @@
Summary: The RPM package management system
Name: rpm
Version: %{rpmver}
Release: %{?snapver:0.%{snapver}.}14%{?dist}
Release: %{?snapver:0.%{snapver}.}15%{?dist}
Group: System Environment/Base
Url: http://www.rpm.org/
Source0: http://rpm.org/releases/rpm-4.12.x/%{name}-%{srcver}.tar.bz2
@ -64,6 +64,7 @@ Patch108: rpm-4.13.0-unsupported-keys.patch
Patch109: rpm-4.13.0-fix-crash-on-corrupted.patch
Patch110: rpm-4.13.0-disabling-filetriggers.patch
Patch111: rpm-4.13.0-chroot-file-triggers.patch
Patch112: rpm-4.13.0-missingok.patch
# These are not yet upstream
Patch302: rpm-4.7.1-geode-i686.patch
@ -568,6 +569,9 @@ exit 0
%doc doc/librpm/html/*
%changelog
* Fri Jan 15 2016 Florian Festi <ffesti@rpm.org> - 4.4.13.0-0.rc1.15
- Add support for missingok file attribute
* Fri Jan 15 2016 Lubos Kardos <lkardos@redhat.com> - 4.13.0-0.rc1.14
- Fix not chrooting transaction file triggers