From 2ba18872f5c70e96d18c8760e6c835c39eb2caca Mon Sep 17 00:00:00 2001 From: Marcel Telka <marcel@telka.sk> Date: Sun, 31 Mar 2024 12:16:31 +0200 Subject: [PATCH] python/jaraco.develop: update to 8.11.1 --- transforms/generate-cleanup | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/transforms/generate-cleanup b/transforms/generate-cleanup index 0028e2f..13bc742 100644 --- a/transforms/generate-cleanup +++ b/transforms/generate-cleanup @@ -67,7 +67,7 @@ <transform dir file link hardlink \ path=usr/perl5/.*/\.packlist$ -> drop> -# python support +# Python support <transform dir file link hardlink path=usr\/lib\/python2\.7\/.*\.pyc$ -> drop> <transform dir file link hardlink path=usr\/lib\/python2\.7\/.*\.pyo$ -> drop> <transform dir file link hardlink path=usr\/lib\/python3\.\d+\/(.*\/)?__pycache__\/ -> drop> @@ -78,12 +78,9 @@ # PEP 627 made the RECORD file optional. Since we do not need the file and it # could contain inaccurate info we simply drop it. <transform dir file link hardlink path=usr\/lib\/python3\.\d+\/vendor-packages\/[^/]+\.dist-info/RECORD$ -> drop> -# Strip Python 3 cpython ABI extension +# Replace Python version by $(PYV) <transform file -> \ - edit path "^(usr/lib/python3\.\d+/vendor-packages/(.*/)?[^/]+)\.cpython-3\d+\.so$" "\1.so"> -# Strip Python 3 abi3 ABI extension -<transform file -> \ - edit path "^(usr/lib/python3\.\d+/vendor-packages/(.*/)?[^/]+)\.abi3\.so$" "\1.so"> + edit path "^(usr/lib/python3\.\d+/vendor-packages/(.*/)?[^/]+\.cpython-)3\d+\.so$" "\1$!(PYV).so"> # Replace Python version by $(PYVER) <transform file path=usr/bin/[^/]+-3\.\d+$ -> default tmp.fmri "$(COMPONENT_FMRI)"> <transform file tmp.fmri=.*runtime/python -> edit path "^(usr/bin/[^/]+-)3\.\d+$" "\1$!(PYVER)"> @@ -94,7 +91,9 @@ <transform dir file link hardlink -> \ edit path "^(usr/lib/python3\.\d+/vendor-packages/[^/]+-py)3\.\d+(-nspkg\.pth)$" "\1$!(PYVER)\2"> <transform dir file link hardlink -> \ - edit path "^(usr/lib/python)3\.\d+(/vendor-packages/)" "\1$!(PYVER)\2"> + edit path "^(usr/lib/python)3\.\d+(/.*)?$" "\1$!(PYVER)\2"> +<transform dir file link hardlink -> \ + edit path "^(usr/include/python)3\.\d+(/.*)?$" "\1$!(PYVER)\2"> <transform dir file link hardlink -> \ edit target "/(sparcv9|amd64)$" "/$!(MACH64)"> @@ -117,9 +116,9 @@ # edit target "$(COMPONENT_NAME)" "$!(COMPONENT_NAME)"> <transform dir file link hardlink -> \ - edit path "$(HUMAN_VERSION)" "$!(HUMAN_VERSION)"> + edit path "$(HUMAN_VERSION_RE)" "$!(HUMAN_VERSION)"> <transform dir file link hardlink -> \ - edit target "$(HUMAN_VERSION)" "$!(HUMAN_VERSION)"> + edit target "$(HUMAN_VERSION_RE)" "$!(HUMAN_VERSION)"> <transform dir file link hardlink -> \ edit path "$(COMPONENT_RE_VERSION)" "$!(COMPONENT_VERSION)"> -- Gitblit v1.9.3