commit 6009cf52f828551ec78c70614d2b978dc01c0ae5
Author: Jan Rękorajski <[email protected]>
Date: Fri Nov 22 23:39:59 2024 +0100
- archive extraction has been moved to rpmuncompress tool that does not
know about build dirs layout
gem-in-package-builddir.patch | 11 -----------
rpm.spec | 2 --
2 files changed, 13 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index d7c7115..fa8e3e2 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -90,7 +90,6 @@ Patch32: noexpand.patch
Patch34: skip-symlinks.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}
@@ -666,7 +665,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML
generowane ze
%patch34 -p1
%patch36 -p1
%patch37 -p1
-#%patch38 -p1
%{__rm} po/*.gmo
diff --git a/gem-in-package-builddir.patch b/gem-in-package-builddir.patch
deleted file mode 100644
index e75f61c..0000000
--- a/gem-in-package-builddir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/6009cf52f828551ec78c70614d2b978dc01c0ae5
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
