parent
d0fa66b1d4
commit
cc1db15b09
31
rpm-4.13.0-recursing-rpmdeps.patch
Normal file
31
rpm-4.13.0-recursing-rpmdeps.patch
Normal file
@ -0,0 +1,31 @@
|
||||
From 33158b3b009e830036d05c138a6b308c1574effe Mon Sep 17 00:00:00 2001
|
||||
From: Lubos Kardos <lkardos@redhat.com>
|
||||
Date: Fri, 15 Jan 2016 15:41:52 +0100
|
||||
Subject: [PATCH] Fix recursive calling of rpmdeps tool (rhbz:1297557)
|
||||
|
||||
---
|
||||
scripts/find-provides | 2 +-
|
||||
scripts/find-requires | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/scripts/find-provides b/scripts/find-provides
|
||||
index c5cf93b..817f5ee 100755
|
||||
--- a/scripts/find-provides
|
||||
+++ b/scripts/find-provides
|
||||
@@ -1,3 +1,3 @@
|
||||
#!/bin/sh
|
||||
|
||||
-/usr/lib/rpm/rpmdeps --provides
|
||||
+/usr/lib/rpm/rpmdeps --define="_use_internal_dependency_generator 1" --provides
|
||||
diff --git a/scripts/find-requires b/scripts/find-requires
|
||||
index 9d192dd..fa5bc88 100755
|
||||
--- a/scripts/find-requires
|
||||
+++ b/scripts/find-requires
|
||||
@@ -1,3 +1,3 @@
|
||||
#!/bin/sh
|
||||
|
||||
-/usr/lib/rpm/rpmdeps --requires
|
||||
+/usr/lib/rpm/rpmdeps --define="_use_internal_dependency_generator 1" --requires
|
||||
--
|
||||
1.9.3
|
||||
|
6
rpm.spec
6
rpm.spec
@ -29,7 +29,7 @@
|
||||
Summary: The RPM package management system
|
||||
Name: rpm
|
||||
Version: %{rpmver}
|
||||
Release: %{?snapver:0.%{snapver}.}15%{?dist}
|
||||
Release: %{?snapver:0.%{snapver}.}16%{?dist}
|
||||
Group: System Environment/Base
|
||||
Url: http://www.rpm.org/
|
||||
Source0: http://rpm.org/releases/rpm-4.12.x/%{name}-%{srcver}.tar.bz2
|
||||
@ -65,6 +65,7 @@ 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
|
||||
Patch113: rpm-4.13.0-recursing-rpmdeps.patch
|
||||
|
||||
# These are not yet upstream
|
||||
Patch302: rpm-4.7.1-geode-i686.patch
|
||||
@ -569,6 +570,9 @@ exit 0
|
||||
%doc doc/librpm/html/*
|
||||
|
||||
%changelog
|
||||
* Fri Jan 15 2016 Lubos Kardos <lkardos@redhat.com> - 4.13.0-0.rc1.16
|
||||
- Fix recursive calling of rpmdeps tool (#1297557)
|
||||
|
||||
* Fri Jan 15 2016 Florian Festi <ffesti@rpm.org> - 4.4.13.0-0.rc1.15
|
||||
- Add support for missingok file attribute
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user