From: Jan Palus <atler@pld-linux.org>
Date: Wed, 9 Dec 2020 12:24:28 +0000 (+0100)
Subject: fix pythondist provides for noarch packages
X-Git-Tag: auto/th/rpm-4.16.1.2-1~18
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=d40117b8f80fdbb36b656838ce7e079150f14263;hp=5a729dea5bff1699afffae5d5d91df4048d5c518;ds=sidebyside

fix pythondist provides for noarch packages
---

diff --git a/rpm-noarch_py_prov.patch b/rpm-noarch_py_prov.patch
new file mode 100644
index 0000000..7c42050
--- /dev/null
+++ b/rpm-noarch_py_prov.patch
@@ -0,0 +1,8 @@
+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)$
diff --git a/rpm.spec b/rpm.spec
index 89e8356..6329cb1 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -79,6 +79,7 @@ Patch25:	rpmio-read-proc-files.patch
 Patch26:	allow-at-in-ver-rel.patch
 Patch27:	no-exeonly-for-elf-reqprov.patch
 Patch28:	default-patch-flags.patch
+Patch29:	%{name}-noarch_py_prov.patch
 URL:		https://rpm.org/
 BuildRequires:	acl-devel
 BuildRequires:	db-devel >= %{db_ver}
@@ -573,6 +574,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+%patch29 -p1
 
 install %{SOURCE15} scripts/perl.prov.in