From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 16 Apr 2022 09:34:16 +0000 (+0200)
Subject: - create gem spec in package build directory, not at top level
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=refs%2Fheads%2Fdev-4.17.0

- create gem spec in package build directory, not at top level
---

diff --git a/gem-in-package-builddir.patch b/gem-in-package-builddir.patch
new file mode 100644
index 0000000..e75f61c
--- /dev/null
+++ b/gem-in-package-builddir.patch
@@ -0,0 +1,11 @@
+--- rpm-4.16.1.3/build/parsePrep.c.orig	2020-12-10 12:30:21.000000000 +0100
++++ rpm-4.16.1.3/build/parsePrep.c	2022-04-16 10:55:43.759059308 +0200
+@@ -197,7 +197,7 @@
+ 	    char gemnameversion[strlen(sp->source) - 3];
+ 
+ 	    rstrlcpy(gemnameversion, sp->source, strlen(sp->source) - 3);
+-	    gemspec = rpmGetPath("%{_builddir}/", gemnameversion, ".gemspec", NULL);
++	    gemspec = rpmGetPath("%{_builddir}/", spec->buildSubdir, "/", gemnameversion, ".gemspec", NULL);
+ 
+ 	    rasprintf(&buf, "%s '%s' && %s spec '%s' --ruby > '%s'",
+ 			zipper, fn, gem, fn, gemspec);
diff --git a/rpm.spec b/rpm.spec
index ccc0aa7..82e3768 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -93,6 +93,7 @@ Patch34:	skip-symlinks.patch
 Patch35:	pl-po.patch
 Patch36:	build-locale.patch
 Patch37:	no-exe-for-elf-req.patch
+Patch38:	gem-in-package-builddir.patch
 URL:		https://rpm.org/
 BuildRequires:	acl-devel
 %{?with_audit:BuildRequires:	audit-libs-devel}
@@ -641,6 +642,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch35 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 
 %{__rm} po/*.gmo