commit d7a6e2b33f20129902a67f42ce62c8bc4f55f815
Author: Jan Rękorajski <[email protected]>
Date: Sat Apr 16 11:34:16 2022 +0200
- create gem spec in package build directory, not at top level, rel 18
gem-in-package-builddir.patch | 11 +++++++++++
rpm.spec | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index 4f4d875..cbae4fd 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -34,7 +34,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 4.16.1.3
-Release: 17
+Release: 18
Epoch: 1
License: GPL v2 / LGPL v2.1
Group: Base
@@ -97,6 +97,7 @@ Patch37: %{name}-pl.po-update.patch
Patch38: no-exe-for-elf-debuginfo.patch
Patch39: no-exe-for-elf-req.patch
Patch40: python-3.10-abi.patch
+Patch41: gem-in-package-builddir.patch
URL: https://rpm.org/
BuildRequires: acl-devel
%{?with_audit:BuildRequires: audit-libs-devel}
@@ -640,6 +641,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML
generowane ze
%patch38 -p1
%patch39 -p1
%patch40 -p1
+%patch41 -p1
%{__rm} po/*.gmo
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);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/d7a6e2b33f20129902a67f42ce62c8bc4f55f815
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
