[packages/rpm/dev-4.18] - remove patch that belongs to python-rpm-packaging package now

baggins baggins at pld-linux.org
Sat Nov 23 01:51:06 CET 2024


commit 680b71db8364f97f53c5468526a880737e47fcbd
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Nov 22 23:54:26 2024 +0100

    - remove patch that belongs to python-rpm-packaging package now

 rpm-noarch_py_prov.patch | 8 --------
 rpm.spec                 | 2 --
 2 files changed, 10 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index fa8e3e2..f478492 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -83,7 +83,6 @@ Patch24:	cpuinfo-deps.patch
 Patch25:	rpmio-read-proc-files.patch
 Patch26:	allow-at-in-ver-rel.patch
 Patch28:	default-patch-flags.patch
-Patch29:	%{name}-noarch_py_prov.patch
 Patch30:	missing-ghost-terminate-build.patch
 Patch31:	missing-doc-terminate-build.patch
 Patch32:	noexpand.patch
@@ -658,7 +657,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch25 -p1
 %patch26 -p1
 %patch28 -p1
-#%patch29 -p1
 %patch30 -p1
 %patch31 -p1
 %patch32 -p1
diff --git a/rpm-noarch_py_prov.patch b/rpm-noarch_py_prov.patch
deleted file mode 100644
index 7c42050..0000000
--- a/rpm-noarch_py_prov.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --color -urN rpm-4.16.0.orig/fileattrs/pythondist.attr rpm-4.16.0/fileattrs/pythondist.attr
---- rpm-4.16.0.orig/fileattrs/pythondist.attr	2020-12-09 12:38:21.203961862 +0100
-+++ rpm-4.16.0/fileattrs/pythondist.attr	2020-12-09 12:58:43.178952892 +0100
-@@ -1,3 +1,3 @@
- %__pythondist_provides	%{_rpmconfigdir}/pythondistdeps.py --provides --majorver-provides
- %__pythondist_requires	%{_rpmconfigdir}/pythondistdeps.py --requires
--%__pythondist_path		/lib(64|x32)?/python[[:digit:]]\\.[[:digit:]]+/site-packages/[^/]+\\.(dist-info|egg-info|egg-link)$
-+%__pythondist_path		/(lib(64|x32)?|share)/python[[:digit:]]\\.[[:digit:]]+/site-packages/[^/]+\\.(dist-info|egg-info|egg-link)$
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/680b71db8364f97f53c5468526a880737e47fcbd



More information about the pld-cvs-commit mailing list