/[packages]/cauldron/python3/current/SPECS/python3.spec

Diff of /cauldron/python3/current/SPECS/python3.spec

Parent Directory | Revision Log | View Patch Patch

-revision 1435999 by wally,
Sat Aug 31 17:16:30 2019 UTC
+revision 1436693 by wally,
Tue Sep  3 15:03:49 2019 UTC
 Line 39
  # 33. file
  # 34. rpmlint
  # 35. rpm-mageia-setup %%bcond_with bootstrap
  # Then the most important packages have to be built, starting from their
  # various leaf dependencies recursively. After these have been built, a
  # targeted rebuild should be requested for the rest.
 Line 48
  # rebuild after a python abi change:
  #   python-sphinx, python-pytest, python-requests
- %global docver  3.7.4
+ %global pybasever 3.8
- %global pybasever 3.7
  %global familyver 3
- #pybasever without the dot:
+ # pybasever without the dot:
- %global pyshortver 37
+ %global pyshortver 38
+ # version
+ %global version 3.8.0
+ # comment out if not prerel
+ %global prerel b4
+ # rel for bumping
+ %global rel 1
+ %bcond_without bootstrap
  # Whether to use RPM build wheels from the python-{pip,setuptools}-wheel package
  # Uses upstream bundled prebuilt wheels otherwise
  %bcond_without rpmwheels
+ # Expensive optimizations (mainly, profile-guided optimizations)
+ %bcond_without optimizations
  # Run the test suite in %%check
  %bcond_without tests
-Line 69
+Line 81
  # The dbm.gnu module (key-value database)
  %bcond_without gdbm
+ # Main interpreter loop optimization
+ %bcond_without computed_gotos
  # Support for the Valgrind debugger/profiler
  %ifarch %{valgrind_arches}
  %bcond_without valgrind
-Line 76
+Line 91
  %bcond_with valgrind
  %endif
- # Some defines to ease files list
+ # =====================
+ # General global macros
+ # =====================
  %global pylibdir %{_libdir}/python%{pybasever}
  %global dynload_dir %{pylibdir}/lib-dynload
  %global site_packages %{pylibdir}/site-packages
  # ABIFLAGS, LDVERSION and SOABI are in the upstream configure.ac
  # See PEP 3149 for some background: http://www.python.org/dev/peps/pep-3149/
- %global ABIFLAGS_optimized m
+ %global ABIFLAGS_optimized %{nil}
  %global LDVERSION_optimized %{pybasever}%{ABIFLAGS_optimized}
-Line 98
+Line 117
  #   foo/__pycache__/bar.cpython-%%{pyshortver}.pyc
  #   foo/__pycache__/bar.cpython-%%{pyshortver}.opt-1.pyc
  #   foo/__pycache__/bar.cpython-%%{pyshortver}.opt-2.pyc
- %global bytecode_suffixes .cpython-%{pyshortver}*.py?
+ %global bytecode_suffixes .cpython-%{pyshortver}*.pyc
  # Disable automatic bytecompilation. The python3 binary is not yet be
  # available in /usr/bin when Python is built. Also, the bytecompilation fails
-Line 112
+Line 131
  Summary:        An interpreted, interactive object-oriented programming language
  Name:           python3
- Version:        3.7.4
+ Version:        3.8.0
- Release:        %mkrel 3
+ Release:        %mkrel %{?prerel:0.%prerel.}%{rel}
  License:        Modified CNRI Open Source License
  Group:          Development/Python
-Line 149 
 BuildRequires:  python-setuptools-wheel
+Line 168 
 BuildRequires:  python-setuptools-wheel
  BuildRequires:  python-pip-wheel
  %endif
- Source0:        https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
+ %if %{without bootstrap}
- Source1:        https://docs.python.org/%{pybasever}/archives/python-%{docver}-docs-html.tar.bz2
+ # for make regen-all and distutils.tests.test_bdist_rpm
+ BuildRequires: python3
+ %endif
+ Source0:        https://www.python.org/ftp/python/%{version}/Python-%{version}%{?prerel}.tar.xz
+ Source1:        https://docs.python.org/%{pybasever}/archives/python-%{version}%{?prerel}-docs-html.tar.bz2
  # A simple script to check timestamps of bytecode files
  # Run in check section with Python that is currently being built
-Line 183 
 Patch102: 00102-lib64.patch
+Line 207 
 Patch102: 00102-lib64.patch
  # Downstream only: not appropriate for upstream
  Patch111: 00111-no-static-lib.patch
- # 00132 #
- # Add non-standard hooks to unittest for use in the "check" phase below, when
- # running selftests within the build:
- #   @unittest._skipInRpmBuild(reason)
- # for tests that hang or fail intermittently within the build environment, and:
- #   @unittest._expectedFailureInRpmBuild
- # for tests that always fail within the build environment
- #
- # The hooks only take effect if WITHIN_PYTHON_RPM_BUILD is set in the
- # environment, which we set manually in the appropriate portion of the "check"
- # phase below (and which potentially other python-* rpms could set, to reuse
- # these unittest hooks in their own "check" phases)
- Patch132: 00132-add-rpmbuild-hooks-to-unittest.patch
- # 00155 #
- # Avoid allocating thunks in ctypes unless absolutely necessary, to avoid
- # generating SELinux denials on "import ctypes" and "import uuid" when
- # embedding Python within httpd
- # See https://bugzilla.redhat.com/show_bug.cgi?id=814391
- Patch155: 00155-avoid-ctypes-thunks.patch
- # 00160 #
- # Python 3.3 added os.SEEK_DATA and os.SEEK_HOLE, which may be present in the
- # header files in the build chroot, but may not be supported in the running
- # kernel, hence we disable this test in an rpm build.
- # Adding these was upstream issue http://bugs.python.org/issue10142
- # Not yet sent upstream
- Patch160: 00160-disable-test_fs_holes-in-rpm-build.patch
- # 00163 #
- # Some tests within test_socket fail intermittently when run inside Koji;
- # disable them using unittest._skipInRpmBuild
- # Not yet sent upstream
- Patch163: 00163-disable-parts-of-test_socket-in-rpm-build.patch
- # 00170 #
- # In debug builds, try to print repr() when a C-level assert fails in the
- # garbage collector (typically indicating a reference-counting error
- # somewhere else e.g in an extension module)
- # The new macros/functions within gcmodule.c are hidden to avoid exposing
- # them within the extension API.
- # Sent upstream: http://bugs.python.org/issue9263
- # See https://bugzilla.redhat.com/show_bug.cgi?id=614680
- Patch170: 00170-gc-assertions.patch
- # 00178 #
- # Don't duplicate various FLAGS in sysconfig values
- # http://bugs.python.org/issue17679
- # Does not affect python2 AFAICS (different sysconfig values initialization)
- Patch178: 00178-dont-duplicate-flags-in-sysconfig.patch
  # 00189 #
  # Instead of bundled wheels, use our RPM packaged wheels from
  # /usr/share/python-wheels
  Patch189: 00189-use-rpm-wheels.patch
- # 00205 #
- # LIBPL variable in makefile takes LIBPL from configure.ac
- # but the LIBPL variable defined there doesn't respect libdir macro
- Patch205: 00205-make-libpl-respect-lib64.patch
  # 00251
  # Set values of prefix and exec_prefix in distutils install command
  # to /usr/local if executable is /usr/bin/python* and RPM build
-Line 251 
 Patch205: 00205-make-libpl-respect-lib64
+Line 219 
 Patch205: 00205-make-libpl-respect-lib64
  # Fedora Change: https://fedoraproject.org/wiki/Changes/Making_sudo_pip_safe
  Patch251: 00251-change-user-install-location.patch
- # 00316 #
+ # 00274 #
- # We remove the exe files from distutil's bdist_wininst
+ # Upstream uses Debian-style architecture naming. Change to match Fedora.
- # So we mark the command as unsupported - and the tests are skipped
+ Patch274: 00274-fix-arch-names.patch
- Patch316: 00316-mark-bdist_wininst-unsupported.patch
+ # 00328 #
+ # Restore pyc to TIMESTAMP invalidation mode as default in rpmbubild
+ # See https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/57#comment-27426
+ Patch328: 00328-pyc-timestamp-invalidation-mode.patch
+ # 00331 #
+ # Fix StructUnionType_paramfunc()
+ # Fix a ctypes regression of Python 3.8
+ # Merged upstream https://bugs.python.org/issue37140
+ # Fixes clang FTBFS https://bugzilla.redhat.com/show_bug.cgi?id=1715016
+ Patch331: 00331-fix-structuniontype_paramfunc.patch
+ # (New patches go here ^^^)
  #
  # Mageia patches
  #
-Line 263 
 Patch500:        python3-3.7.1-module-li
+Line 243 
 Patch500:        python3-3.7.1-module-li
  Patch501:        python3-3.5.2-skip-distutils-tests-that-fail-in-rpmbuild.patch
  Patch502:        python3-3.7.1-uid-gid-overflows.patch
  Patch503:        python3-3.5.2-dont-raise-from-py_compile.patch
- Patch504:        python3-3.5.2-remove-hf-from-arm-triplet.patch
  Patch506:        python3-3.6.2-python3-config-LIBPLUSED-cmp0004-error.patch
  Provides:       python(abi) = %{pybasever}
  Provides:       /usr/bin/python%{LDVERSION_optimized}
  Provides:       /usr/bin/python%{pybasever}
  Requires:       python-rpm-macros
  Requires:       python3-rpm-macros
- Conflicts:      tkinter3 < %{version}
  Conflicts:      python < 2.7.16-3
  Requires:       %{lib_name} = %{version}-%{release}
-Line 311 
 Group:          Development/Python
+Line 288 
 Group:          Development/Python
  Requires:       python-setuptools-wheel
  Requires:       python-pip-wheel
  %else
- Provides:       bundled(python3-pip) = 19.0.3
+ Provides:       bundled(python3-pip) = 19.2.3
- Provides:       bundled(python3-setuptools) = 40.8.0
+ Provides:       bundled(python3-setuptools) = 41.2.0
  %endif
  %description -n %{lib_name}-stdlib
-Line 334 
 It is normally not used on its own, but
+Line 311 
 It is normally not used on its own, but
  %package -n     %{develname}
  Summary:        The libraries and header files needed for Python development
  Group:          Development/Python
- Requires:       %{name} = %version
+ Requires:       %{name} = %{version}-%{release}
  Requires:       %{lib_name} = %{version}-%{release}
  Provides:       %{name}-devel = %{version}-%{release}
  Provides:       %{lib_name_orig}-devel = %{version}-%{release}
-Line 391 
 Requires:       tkinter3
+Line 368 
 Requires:       tkinter3
  Various applications written using tkinter
  %prep
- %setup -qn Python-%{version}
+ %setup -qn Python-%{version}%{?prerel}
  # 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
-Line 407 
 rm -r Modules/expat
+Line 384 
 rm -r Modules/expat
  %patch102 -p1
  %endif
  %patch111 -p1
- %patch132 -p1
- %patch155 -p1
- %patch160 -p1
- %patch163 -p1
- %patch170 -p1
- %patch178 -p1
  %if %{with rpmwheels}
  %patch189 -p1
  rm Lib/ensurepip/_bundled/*.whl
  %endif
- %patch205 -p1
  %patch251 -p1
- %patch316 -p1
+ %patch274 -p1
+ %patch328 -p1
+ %patch331 -p1
  # Mageia patches
- %patch500 -p1
+ #patch500 -p1
  %patch501 -p1
  %patch502 -p1
  %patch503 -p1
- %patch504 -p1
  %patch506 -p1
  # Remove files that should be generated by the build
-Line 447 
 find . -type f -print0 | xargs -0 perl -
+Line 418 
 find . -type f -print0 | xargs -0 perl -
  %build
  autoreconf -vfi
- # We need -fwrapv
- # https://bugs.python.org/issue34096
- export OPT="%{optflags} -D_GNU_SOURCE -fPIC -fwrapv"
- export CFLAGS="%{optflags} -D_GNU_SOURCE -fPIC -fwrapv"
- export CXXFLAGS="%{optflags} -D_GNU_SOURCE -fPIC -fwrapv"
- # to fix curses module build
- # https://bugs.mageia.org/show_bug.cgi?id=6702
- export CPPFLAGS="-I/usr/include/ncursesw"
  # Remove -Wl,--no-undefined in accordance with MGA #9395 :
  # https://bugs.mageia.org/show_bug.cgi?id=9395
  %define _disable_ld_no_undefined 1
+ # Get proper option names from bconds
+ %if %{with computed_gotos}
+ %global computed_gotos_flag yes
+ %else
+ %global computed_gotos_flag no
+ %endif
+ %if %{with optimizations}
+ %global optimizations_flag "--enable-optimizations"
+ %else
+ %global optimizations_flag "--disable-optimizations"
+ %endif
+ export CFLAGS="%{optflags} -D_GNU_SOURCE -fPIC -fwrapv"
+ export CFLAGS_NODIST="%{optflags} -D_GNU_SOURCE -fPIC -fwrapv"
+ export CXXFLAGS="%{optflags} -D_GNU_SOURCE -fPIC -fwrapv"
+ export CPPFLAGS="$(pkg-config --cflags-only-I libffi)"
+ export OPT="%{optflags} -D_GNU_SOURCE -fPIC -fwrapv"
+ export LINKCC="gcc"
+ export CFLAGS="$CFLAGS $(pkg-config --cflags openssl)"
+ export LDFLAGS="%{ldflags} $(pkg-config --libs-only-L openssl)"
+ export LDFLAGS_NODIST="%{ldflags} $(pkg-config --libs-only-L openssl)"
  %configure2_5x \
    --enable-ipv6 \
    --enable-shared \
-   --with-dbmliborder=gdbm \
+   --with-computed-gotos=%{computed_gotos_flag} \
+   --with-dbmliborder=gdbm:ndbm:bdb \
    --with-system-expat \
    --with-system-ffi \
    --enable-loadable-sqlite-extensions \
-Line 475 
 export CPPFLAGS="-I/usr/include/ncursesw
+Line 460 
 export CPPFLAGS="-I/usr/include/ncursesw
    --with-valgrind \
  %endif
    --with-threads \
-   --without-ensurepip
+   --without-ensurepip \
+   %{optimizations_flag}
  # (misc) if the home is nfs mounted, rmdir fails due to delay
  export TMP="/tmp" TMPDIR="/tmp"
- make EXTRA_CFLAGS="$CFLAGS" LN="ln -sf"
+ %if %{without bootstrap}
+   # Regenerate generated files (needs python3)
+   %make_build regen-all PYTHON_FOR_REGEN="python%{pybasever}"
+ %endif
+ %make_build EXTRA_CFLAGS="$CFLAGS" LN="ln -sf"
  %install
-Line 517 
 install -d -m 0755 %{buildroot}%{_prefix
+Line 508 
 install -d -m 0755 %{buildroot}%{_prefix
  # overwrite the copied binary with a link
  pushd %{buildroot}%{_bindir}
- ln -sf python%{LDVERSION_optimized} python%{pybasever}
+ #ln -sf python%{LDVERSION_optimized} python%{pybasever}
  ln -sf python%{pybasever} python%{familyver}
  popd
-Line 528 
 popd
+Line 519 
 popd
  # make python3 as default one
  ln -s ./python3 %{buildroot}%{_bindir}/python
  ln -s ./pydoc3 %{buildroot}%{_bindir}/pydoc
+ ln -s ./pygettext3.py %{buildroot}%{_bindir}/pygettext.py
+ ln -s ./msgfmt3.py %{buildroot}%{_bindir}/msgfmt.py
  ln -s ./python3-config %{buildroot}%{_bindir}/python-config
  ln -s ./python3.1 %{buildroot}%{_mandir}/man1/python.1
  ln -s ./python3.pc %{buildroot}%{_libdir}/pkgconfig/python.pc
-Line 609 
 sed -i -e "s/'pyconfig.h'/'pyconfig-%{__
+Line 602 
 sed -i -e "s/'pyconfig.h'/'pyconfig-%{__
  # See https://github.com/fedora-python/python-rpm-porting/issues/24
  cp -p Tools/scripts/pathfix.py %{buildroot}%{_bindir}/
+ # Install i18n tools to bindir
+ # They are also in python2, so we version them
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1571474
+ for tool in pygettext msgfmt; do
+   cp -p Tools/i18n/${tool}.py %{buildroot}%{_bindir}/${tool}%{pybasever}.py
+   ln -s ${tool}%{pybasever}.py %{buildroot}%{_bindir}/${tool}3.py
+ done
  # Switch all shebangs to refer to the specific Python version.
  # This currently only covers files matching ^[a-zA-Z0-9_]+\.py$,
  # so handle files named using other naming scheme separately.
-Line 616 
 LD_LIBRARY_PATH=./ ./python \
+Line 617 
 LD_LIBRARY_PATH=./ ./python \
    Tools/scripts/pathfix.py \
    -i "%{_bindir}/python%{pybasever}" -pn \
    %{buildroot} \
+   %{buildroot}%{_bindir}/*%{pybasever}.py \
    %{?with_gdb_hooks:%{buildroot}$DirHoldingGdbPy/*.py}
  # Remove shebang lines from .py files that aren't executable, and
-Line 679 
 EXCLUDE="$EXCLUDE test_posix test_asynci
+Line 681 
 EXCLUDE="$EXCLUDE test_posix test_asynci
  EXCLUDE="$EXCLUDE test_json"
  # to investigate why it fails on local build
  EXCLUDE="$EXCLUDE test_site"
+ %if %{with bootstrap}
+ EXCLUDE="$EXCLUDE test_distutils"
+ %endif
  # all tests must pass
  # but we disable network on BS
  WITHIN_PYTHON_RPM_BUILD= \
-Line 696 
 make test TESTOPTS="-j1 -wW -u none -x $
+Line 701 
 make test TESTOPTS="-j1 -wW -u none -x $
  %{_bindir}/python%{familyver}
  %{_bindir}/python%{pybasever}
  %{_bindir}/python%{LDVERSION_optimized}
- %{_bindir}/pyvenv
- %{_bindir}/pyvenv-%{pybasever}
  %{_bindir}/2to3
  %{_bindir}/2to3-%{pybasever}
  %{_mandir}/man*/*
-Line 855 
 make test TESTOPTS="-j1 -wW -u none -x $
+Line 858 
 make test TESTOPTS="-j1 -wW -u none -x $
  %{dynload_dir}/_multiprocessing.%{SOABI_optimized}.so
  %{dynload_dir}/_opcode.%{SOABI_optimized}.so
  %{dynload_dir}/_pickle.%{SOABI_optimized}.so
+ %{dynload_dir}/_posixshmem.%{SOABI_optimized}.so
  %{dynload_dir}/_posixsubprocess.%{SOABI_optimized}.so
  %{dynload_dir}/_queue.%{SOABI_optimized}.so
  %{dynload_dir}/_random.%{SOABI_optimized}.so
  %{dynload_dir}/_socket.%{SOABI_optimized}.so
  %{dynload_dir}/_sqlite3.%{SOABI_optimized}.so
+ %{dynload_dir}/_statistics.%{SOABI_optimized}.so
  %{dynload_dir}/_ssl.%{SOABI_optimized}.so
  %{dynload_dir}/_struct.%{SOABI_optimized}.so
  %{dynload_dir}/_md5.%{SOABI_optimized}.so
  %{dynload_dir}/_sha1.%{SOABI_optimized}.so
  %{dynload_dir}/_sha256.%{SOABI_optimized}.so
  %{dynload_dir}/_sha512.%{SOABI_optimized}.so
+ %{dynload_dir}/_xxsubinterpreters.%{SOABI_optimized}.so
  %{dynload_dir}/array.%{SOABI_optimized}.so
  %{dynload_dir}/audioop.%{SOABI_optimized}.so
  %{dynload_dir}/binascii.%{SOABI_optimized}.so
-Line 885 
 make test TESTOPTS="-j1 -wW -u none -x $
+Line 891 
 make test TESTOPTS="-j1 -wW -u none -x $
  %{dynload_dir}/spwd.%{SOABI_optimized}.so
  %{dynload_dir}/syslog.%{SOABI_optimized}.so
  %{dynload_dir}/termios.%{SOABI_optimized}.so
- %{dynload_dir}/_testmultiphase.%{SOABI_optimized}.so
  %{dynload_dir}/unicodedata.%{SOABI_optimized}.so
  %{dynload_dir}/_uuid.%{SOABI_optimized}.so
  %{dynload_dir}/xxlimited.%{SOABI_optimized}.so
-Line 899 
 make test TESTOPTS="-j1 -wW -u none -x $
+Line 904 
 make test TESTOPTS="-j1 -wW -u none -x $
  %{pylibdir}/distutils/tests
  %{pylibdir}/lib2to3/tests
  %{pylibdir}/sqlite3/test
- %{pylibdir}/test/*
+ %{pylibdir}/test/
  %{pylibdir}/unittest/test
  # These two are shipped in the main subpackage:
  %exclude %{pylibdir}/test/test_support.py*
-Line 908 
 make test TESTOPTS="-j1 -wW -u none -x $
+Line 913 
 make test TESTOPTS="-j1 -wW -u none -x $
  %{dynload_dir}/_testcapi.%{SOABI_optimized}.so
  %{dynload_dir}/_testbuffer.%{SOABI_optimized}.so
  %{dynload_dir}/_testimportmultiple.%{SOABI_optimized}.so
+ %{dynload_dir}/_testinternalcapi.%{SOABI_optimized}.so
+ %{dynload_dir}/_testmultiphase.%{SOABI_optimized}.so
  %{dynload_dir}/_xxtestfuzz.%{SOABI_optimized}.so
  %files -n %{lib_name}
-Line 915 
 make test TESTOPTS="-j1 -wW -u none -x $
+Line 922 
 make test TESTOPTS="-j1 -wW -u none -x $
  %files -n %{develname}
  %{_bindir}/pathfix.py
+ %{_bindir}/pygettext.py
+ %{_bindir}/pygettext%{familyver}*.py
+ %{_bindir}/msgfmt.py
+ %{_bindir}/msgfmt%{familyver}*.py
+ %{_bindir}/python-config
+ %{_bindir}/python%{pybasever}-config
+ %{_bindir}/python%{LDVERSION_optimized}-config
+ %{_bindir}/python%{familyver}-config
  %{_libdir}/libpython%{LDVERSION_optimized}.so
  %{_libdir}/libpython%{pybasever}.so
  %{_libdir}/libpython%{familyver}.so
  %{_includedir}/python%{LDVERSION_optimized}
  %exclude %{_includedir}/python%{LDVERSION_optimized}/pyconfig-%{__isa_bits}.h
  %{pylibdir}/config-%{LDVERSION_optimized}-%{_arch}-linux%{_gnu}
- %{_bindir}/python-config
- %{_bindir}/python%{pybasever}-config
- %{_bindir}/python%{LDVERSION_optimized}-config
- %{_bindir}/python%{familyver}-config
  %{_libdir}/pkgconfig/python.pc
  %{_libdir}/pkgconfig/python-%{LDVERSION_optimized}.pc
- %{_libdir}/pkgconfig/python-%{pybasever}.pc
+ %{_libdir}/pkgconfig/python-%{pybasever}{,-embed}.pc
- %{_libdir}/pkgconfig/python%{familyver}.pc
+ %{_libdir}/pkgconfig/python%{familyver}{,-embed}.pc
  %exclude %{pylibdir}/config-%{LDVERSION_optimized}-%{_arch}-linux%{_gnu}/Makefile
  %if %{with valgrind}

 Legend:



Removed from v.1435999
 


changed lines


 
Added in v.1436693
 Legend:



Removed from v.1435999
 


changed lines


 
Added in v.1436693
-Removed from v.1435999
+Added in v.1436693

	ViewVC Help
Powered by ViewVC 1.1.30