#9 Remove %{pylibdir}/Tools/scripts/2to3
Closed 2 years ago by pviktori. Opened 2 years ago by churchyard.
rpms/ churchyard/python3 exclude2to3tools  into  master

file modified
+8 -1

@@ -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: 14%{?dist}

+ Release: 15%{?dist}

  License: Python

  

  

@@ -893,10 +893,14 @@ 

    %{buildroot}%{pylibdir}/sysconfig.py

  

  # Switch all shebangs to refer to the specific Python version.

+ # This currently only covers files with .py extension

  LD_LIBRARY_PATH=./build/optimized ./build/optimized/python \

    Tools/scripts/pathfix.py \

    -i "%{_bindir}/python%{pybasever}" \

    %{buildroot}

+ # not covered, also redundant and useless:

+ %exclude %{pylibdir}/Tools/scripts/2to3

+ 

  

  # Remove shebang lines from .py files that aren't executable, and

  # remove executability from .py files that don't have a shebang line:

@@ -1576,6 +1580,9 @@ 

  # ======================================================

  

  %changelog

+ * Fri Sep 01 2017 Miro Hrončok <mhroncok@redhat.com> - 3.6.2-15

+ - Remove %%{pylibdir}/Tools/scripts/2to3

+ 

  * Fri Sep 01 2017 Miro Hrončok <mhroncok@redhat.com> - 3.6.2-14

  - Expat >= 2.1.0 is everywhere, remove explicit requires

  - Conditionalize systemtap-devel BuildRequires

  • the file has wrong shebang (#!/usr/bin/env python)
    • it is not covered by the shebang correction because it is not named with .py extension
    • a note has been added to the shebang correction code about this
  • ignoring shebang, the file is identical to /usr/bin/2to3
    • thus redundant

rebased

2 years ago

Can we rm rather than %exclude it?
I think %exclude should be used for excluding files from individual subpackages. Files we don't want to package at all I'd rather nuke as soon in the build process as possible.
Does that sound reasonable? Or do you prefer %exclude here?

I have no strong opinion. Will rm.

rebased

2 years ago

That seems to be the wrong commit. I made the following change and pushed this:

 # not covered, also redundant and useless:
-%exclude %{pylibdir}/Tools/scripts/2to3
+rm %{buildroot}%{pylibdir}/Tools/scripts/2to3

Pull-Request has been closed by pviktori

2 years ago
Metadata