Merge lib64 patches into one (104 into 102)
It doean't make sense for these to be separate.
This commit is contained in:
parent
96a7bd540e
commit
2c6abcc9a3
3 changed files with 19 additions and 19 deletions
11
python3.spec
11
python3.spec
|
|
@ -259,12 +259,11 @@ Patch1: 00001-rpath.patch
|
|||
# (where sys.getfilesystemencoding() == 'ascii')
|
||||
Patch55: 00055-systemtap.patch
|
||||
|
||||
Patch102: 00102-lib64.patch
|
||||
|
||||
# 00104 #
|
||||
# 00102 #
|
||||
# Change the various install paths to use /usr/lib64/ instead or /usr/lib
|
||||
# Only used when "%{_lib}" == "lib64"
|
||||
# Another lib64 fix, for distutils/tests/test_install.py; not upstream:
|
||||
Patch104: 00104-lib64-fix-for-test_install.patch
|
||||
# Not yet sent upstream.
|
||||
Patch102: 00102-lib64.patch
|
||||
|
||||
# 00111 #
|
||||
# Patch the Makefile.pre.in so that the generated Makefile doesn't try to build
|
||||
|
|
@ -687,7 +686,6 @@ sed -r -i s/'_PIP_VERSION = "[0-9.]+"'/'_PIP_VERSION = "%{pip_version}"'/ Lib/en
|
|||
|
||||
%if "%{_lib}" == "lib64"
|
||||
%patch102 -p1
|
||||
%patch104 -p1
|
||||
%endif
|
||||
%patch111 -p1
|
||||
%patch132 -p1
|
||||
|
|
@ -1680,6 +1678,7 @@ fi
|
|||
* Mon Aug 28 2017 Petr Viktorin <pviktori@redhat.com> - 3.6.2-13
|
||||
- Rename patch files to be consistent
|
||||
- Run autotools to generate the configure script before building
|
||||
- Merge lib64 patches (104 into 102)
|
||||
|
||||
* Mon Aug 28 2017 Michal Cyprian <mcyprian@redhat.com> - 3.6.2-12
|
||||
- Use python3 style of calling super() without arguments in rpath
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue