From fd719c4023dee9de688f499648096958ebb62c91343c220394f63206d809c95c Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 27 Feb 2015 12:22:00 +0000 Subject: [PATCH] - apply db.diff from the subdir to avoid patching through a symlink (to please new patch) OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=352 --- rpm.changes | 6 ++++++ rpm.spec | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/rpm.changes b/rpm.changes index 22c29f4..5cecb95 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 27 12:21:40 UTC 2015 - coolo@suse.com + +- apply db.diff from the subdir to avoid patching through a symlink + (to please new patch) + ------------------------------------------------------------------- Fri Feb 20 12:26:17 UTC 2015 - meissner@suse.com diff --git a/rpm.spec b/rpm.spec index ca4559c..368a8ff 100644 --- a/rpm.spec +++ b/rpm.spec @@ -207,10 +207,13 @@ rm -rf beecrypt tar xjf %{SOURCE10} tar xjf %{SOURCE11} ln -s db-4.8.30 db +cd db +%patch2 -p1 +cd .. ln -s beecrypt-4.1.2 beecrypt chmod -R u+w db/* rm -f rpmdb/db.h -%patch -P 1 -P 2 +%patch -P 1 %patch3 -p1 %patch -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19 %patch -P 20 -P 21 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29