PR#12: Fix /usr/bin/env dependency from python3-tools (rhbz#1482118) - rpms/python3

rpms / python3

#12 Fix /usr/bin/env dependency from python3-tools (rhbz#1482118)

Merged 6 years ago by torsava. Opened 6 years ago by ishcherb.

rpms/ ishcherb/python3 master into master

Fix /usr/bin/env dependency from python3-tools (rhbz#1482118)

Iryna Shcherbina • 6 years ago

685fb7b

python3.spec

file modified

+10 -4

		`@@ -14,7 +14,7 @@`
		`# WARNING When rebasing to a new Python version,`
		`# remember to update the python3-docs package as well`
		`Version: %{pybasever}.2`
		`- Release: 17%{?dist}`
		`+ Release: 18%{?dist}`
		`License: Python`


		`@@ -914,13 +914,15 @@`
		`%{buildroot}%{pylibdir}/sysconfig.py`

		`# Switch all shebangs to refer to the specific Python version.`
		`- # This currently only covers files with .py extension`
		`+ # This currently only covers files matching ^[a-zA-Z0-9_]+\.py$,`
		`+ # so handle files named using other naming scheme separately.`
		`LD_LIBRARY_PATH=./build/optimized ./build/optimized/python \`
		`Tools/scripts/pathfix.py \`
		`-i "%{_bindir}/python%{pybasever}" \`
		`- %{buildroot}`
		`+ %{buildroot} %{buildroot}%{pylibdir}/Tools/scripts/-.py \`
		`+ %{buildroot}%{pylibdir}/Tools/pynche/{pynche,pynche.pyw}`
		`# not covered, also redundant and useless:`
		`- rm %{buildroot}%{pylibdir}/Tools/scripts/2to3`
		`+ rm %{buildroot}%{pylibdir}/Tools/scripts/{2to3,idle3,pydoc3,pyvenv}`


		`# Remove shebang lines from .py files that aren't executable, and`
		`@@ -1526,6 +1528,10 @@`
		`# ======================================================`

		`%changelog`
		`+ * Wed Sep 13 2017 Iryna Shcherbina <ishcherb@redhat.com> - 3.6.2-18`
		`+ - Fix /usr/bin/env dependency from python3-tools`
		`+ Resolves: rhbz#1482118`
		`+`
		`* Wed Sep 06 2017 Iryna Shcherbina <ishcherb@redhat.com> - 3.6.2-17`
		- Include `-g` in the flags sent to the linker (LDFLAGS)
		`Resolves: rhbz#1483222`

ishcherb commented 6 years ago

Tools/scripts/pathfix.py does not automatically fix Python modules with - instead if _. Specify them separately.
Files not covered by the shebang correction because they do not have .py extension:
- idle3 - identical to /usr/bin/idle3 (from python3-tools RPM)
- pydoc3 - identical to /usr/bin/pydoc3 (from python3 RPM)
- pyenv - identical to /usr/bin/pyvenv (from python3 RPM)
- pynche,pynche.pyw - pynche can be used as a library, the executable is not needed

Koji scratch build

churchyard commented 6 years ago

Problem's gone:

$ rpm -qp --requires python3-tools-3.6.2-18.fc28.x86_64.rpm 
/usr/bin/python3.6
python3 = 3.6.2-18.fc28
python3-tkinter = 3.6.2-18.fc28
rpmlib(CompressedFileNames) <= 3.0.4-1
rpmlib(FileDigests) <= 4.6.0-1
rpmlib(PartialHardlinkSets) <= 4.0.4-1
rpmlib(PayloadFilesHavePrefix) <= 4.0-1
rpmlib(PayloadIsXz) <= 5.2-1

I have a problem with this:

pynche can be used as a library, the executable is not needed

The executable produces a GUI window. Not sure if needed or not, but probably fixing the shebang might be a better idea here, until we decide to get rid of all the thing in .../Tools.

ishcherb commented 6 years ago

I have a problem with this:

pynche can be used as a library, the executable is not needed

The executable produces a GUI window. Not sure if needed or not, but probably fixing the shebang might be a better idea here, until we decide to get rid of all the thing in .../Tools.

That is fair enough. I am going to change it.

rebased onto 685fb7b

6 years ago

ishcherb commented 6 years ago

Changed. Running scratch build here

churchyard commented 6 years ago

LGTM