#30 Remove patch 316
Merged 2 months ago by churchyard. Opened 2 months ago by churchyard.
rpms/ churchyard/python38 no316  into  master

@@ -1,27 +0,0 @@ 

- From b4bb0385ffcfafb2a203b0863777b135d37feb3a Mon Sep 17 00:00:00 2001

- From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>

- Date: Thu, 20 Dec 2018 12:46:25 +0100

- Subject: [PATCH 7/7] 00316: Mark bdist_wininst unsupported

- 

- We remove the exe files from distutil's bdist_wininst.

- So we mark the command as unsupported - and the tests are skipped.

- ---

-  Lib/distutils/command/bdist_wininst.py | 2 ++

-  1 file changed, 2 insertions(+)

- 

- diff --git a/Lib/distutils/command/bdist_wininst.py b/Lib/distutils/command/bdist_wininst.py

- index acaa184b5f..6b458cb364 100644

- --- a/Lib/distutils/command/bdist_wininst.py

- +++ b/Lib/distutils/command/bdist_wininst.py

- @@ -12,6 +12,8 @@ from distutils.sysconfig import get_python_version

-  from distutils import log

-  

-  class bdist_wininst(Command):

- +    # Marker for tests that we have the unsupported bdist_wininst

- +    _unsupported = True

-  

-      description = "create an executable installer for MS Windows"

-  

- -- 

- 2.21.0

- 

file modified
-6

@@ -259,11 +259,6 @@ 

  # Upstream uses Debian-style architecture naming. Change to match Fedora.

  Patch274: 00274-fix-arch-names.patch

  

- # 00316 #

- # We remove the exe files from distutil's bdist_wininst

- # So we mark the command as unsupported - and the tests are skipped

- Patch316: 00316-mark-bdist_wininst-unsupported.patch

- 

  # (New patches go here ^^^)

  #

  # When adding new patches to "python" and "python3" in Fedora, EL, etc.,

@@ -536,7 +531,6 @@ 

  

  %patch251 -p1

  %patch274 -p1

- %patch316 -p1

  

  

  # Remove files that should be generated by the build

The patch landed in Python in be5bb52f5f2d4da4b9d6f42399f7275ab47910f3

However patch 316 still applied cleanly.
Removing it doesn't make any difference, so not bumping anything.

LGTM.

Currently, bdist_wininst "_unsupported" class attribute is set twice. The *.exe files are still removed in %prep:

# Remove all exe files to ensure we are not shipping prebuilt binaries
# note that those are only used to create Microsoft Windows installers
# and that functionality is broken on Linux anyway
find -name '*.exe' -print -delete

Pull-Request has been merged by churchyard

2 months ago