PR#4: Switch from pathfix.py to %py3_shebang_fix - rpms/diskimage-builder

rpms / diskimage-builder

#4 Switch from pathfix.py to %py3_shebang_fix

Merged 2 years ago by jcapitao. Opened 2 years ago by lbalhar.

rpms/ lbalhar/diskimage-builder rawhide into rawhide

Switch from pathfix.py to %py3_shebang_fix

Lumir Balhar • 2 years ago

5426775

diskimage-builder.spec

file modified

+10 -11

		`@@ -28,7 +28,6 @@`
		`BuildRequires: python3-devel`
		`BuildRequires: python3-setuptools`
		`BuildRequires: python3-pbr`
		`- BuildRequires: /usr/bin/pathfix.py`

		`Requires: kpartx`
		`Requires: qemu-img`
		`@@ -84,16 +83,16 @@`
		`rm -f %{buildroot}%{_bindir}/dib-run-parts`

		`# Fix shebangs for Python 3-only distros`
		`- pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/pypi/pre-install.d/04-configure-pypi-mirror`
		`- pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/deploy-targetcli/extra-data.d/module/targetcli-wrapper`
		`- pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/package-installs/bin/package-installs-squash`
		`- pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/svc-map/extra-data.d/10-merge-svc-map-files`
		`- pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/svc-map/bin/svc-map`
		`- pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{python3_sitelib}/diskimage_builder/elements/pypi/pre-install.d/04-configure-pypi-mirror`
		`- pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{python3_sitelib}/diskimage_builder/elements/deploy-targetcli/extra-data.d/module/targetcli-wrapper`
		`- pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{python3_sitelib}/diskimage_builder/elements/package-installs/bin/package-installs-squash`
		`- pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{python3_sitelib}/diskimage_builder/elements/svc-map/extra-data.d/10-merge-svc-map-files`
		`- pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{python3_sitelib}/diskimage_builder/elements/svc-map/bin/svc-map`
		`+ %py3_shebang_fix %{buildroot}%{_datadir}/%{name}/elements/pypi/pre-install.d/04-configure-pypi-mirror`
		`+ %py3_shebang_fix %{buildroot}%{_datadir}/%{name}/elements/deploy-targetcli/extra-data.d/module/targetcli-wrapper`
		`+ %py3_shebang_fix %{buildroot}%{_datadir}/%{name}/elements/package-installs/bin/package-installs-squash`
		`+ %py3_shebang_fix %{buildroot}%{_datadir}/%{name}/elements/svc-map/extra-data.d/10-merge-svc-map-files`
		`+ %py3_shebang_fix %{buildroot}%{_datadir}/%{name}/elements/svc-map/bin/svc-map`
		`+ %py3_shebang_fix %{buildroot}%{python3_sitelib}/diskimage_builder/elements/pypi/pre-install.d/04-configure-pypi-mirror`
		`+ %py3_shebang_fix %{buildroot}%{python3_sitelib}/diskimage_builder/elements/deploy-targetcli/extra-data.d/module/targetcli-wrapper`
		`+ %py3_shebang_fix %{buildroot}%{python3_sitelib}/diskimage_builder/elements/package-installs/bin/package-installs-squash`
		`+ %py3_shebang_fix %{buildroot}%{python3_sitelib}/diskimage_builder/elements/svc-map/extra-data.d/10-merge-svc-map-files`
		`+ %py3_shebang_fix %{buildroot}%{python3_sitelib}/diskimage_builder/elements/svc-map/bin/svc-map`

		`%description`
		`Components of TripleO that are responsible for building disk images.`