PR#29: EPEL 7: Don't use unsupported glob in %pycached, support RPM < 4.13 - rpms/epel-rpm-macros

rpms / epel-rpm-macros

#29 EPEL 7: Don't use unsupported glob in %pycached, support RPM < 4.13

Merged 3 years ago by churchyard. Opened 3 years ago by churchyard.

rpms/ churchyard/epel-rpm-macros epel7-pycached-fix into epel7

Don't use unsupported glob in %pycached, support RPM < 4.13

Miro Hrončok • 3 years ago

4074d4d

epel-rpm-macros.spec

file modified

+5 -1

		`@@ -1,6 +1,6 @@`
		`Name: epel-rpm-macros`
		`Version: 7`
		`- Release: 29`
		`+ Release: 30`
		`Summary: Extra Packages for Enterprise Linux RPM macros`

		`Group: System Environment/Base`
		`@@ -54,6 +54,10 @@`


		`%changelog`
		`+ * Fri Apr 23 2021 Miro Hrončok <mhroncok@redhat.com> - 7-30`
		`+ - Make %%pycached compatible with RPM < 4.13`
		`+ - Fixes: rhbz#1952704`
		`+`
		`* Tue Nov 10 2020 Miro Hrončok <mhroncok@redhat.com> - 7-29`
		`- Backport %%py_provides`

macros.epel-rpm-macros

file modified

+2 -1

		`@@ -66,7 +66,8 @@`
		`else`
		`dirname = path:match("(.*/)")`
		`modulename = path:match(".*/([^/]+).py")`
		`- print("\\n" .. dirname .. "__pycache__/" .. modulename .. ".cpython-3" .. pyminor .. "{,.opt-?}.pyc")`
		`+ print("\\n" .. dirname .. "__pycache__/" .. modulename .. ".cpython-3" .. pyminor .. ".pyc")`
		`+ print("\\n" .. dirname .. "__pycache__/" .. modulename .. ".cpython-3" .. pyminor .. ".opt-?.pyc")`
		`end`
		`end`
		`}`

churchyard commented 3 years ago

Before:

$ rpm -q epel-rpm-macros
epel-rpm-macros-7-29.noarch

$ rpm --eval '%pycached %{python3_sitelib}/%{srcname}.py'
/usr/lib/python3.6/site-packages/%{srcname}.py
/usr/lib/python3.6/site-packages/__pycache__/%{srcname}.cpython-36{,.opt-?}.pyc

After:

$ rpm -q epel-rpm-macros
epel-rpm-macros-7-30.noarch

$ rpm --eval '%pycached %{python3_sitelib}/%{srcname}.py'
/usr/lib/python3.6/site-packages/%{srcname}.py
/usr/lib/python3.6/site-packages/__pycache__/%{srcname}.cpython-36.pyc
/usr/lib/python3.6/site-packages/__pycache__/%{srcname}.cpython-36.opt-?.pyc

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1952704