Hello community, here is the log from the commit of package qpid-proton for openSUSE:Factory checked in at 2020-11-15 15:21:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qpid-proton (Old) and /work/SRC/openSUSE:Factory/.qpid-proton.new.24930 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qpid-proton" Sun Nov 15 15:21:57 2020 rev:17 rq:848247 version:0.31.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qpid-proton/qpid-proton.changes 2020-06-08 23:51:54.894823462 +0200 +++ /work/SRC/openSUSE:Factory/.qpid-proton.new.24930/qpid-proton.changes 2020-11-15 15:22:36.451208447 +0100 @@ -1,0 +2,11 @@ +Fri Nov 6 11:28:17 UTC 2020 - Benjamin Greiner <[email protected]> + +- Add qpid-proton-rpmlintrc to filter devel file warning in test +- qpid-pythonbuild.patch do not compile during cmake phase with + wrong interpreter. Expanded python setup.py install will do it + for the correct flavors. Avoids packaging python2 cache files + into python3 flavors +- Prepare python singlespec mutltiflavor feature for upcoming + multiple python3 flavors -- gh#openSUSE/python-rpm-macros#66 + +------------------------------------------------------------------- New: ---- qpid-proton-rpmlintrc qpid-pythonbuild.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qpid-proton.spec ++++++ --- /var/tmp/diff_new_pack.IhvLe9/_old 2020-11-15 15:22:40.851213156 +0100 +++ /var/tmp/diff_new_pack.IhvLe9/_new 2020-11-15 15:22:40.855213161 +0100 @@ -17,6 +17,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define oldpython python %global qpid_proton_soversion 10 %global qpid_proton_cpp_soversion 12 %global qpid_proton_proactor_soversion 1 @@ -32,7 +33,11 @@ Group: Productivity/Networking/Other URL: https://qpid.apache.org/proton/ Source0: http://www.apache.org/dist/qpid/proton/%{version}/%{name}-%{version}.tar.gz +# devel files in test package +Source99: qpid-proton-rpmlintrc Patch0: qpid-proton-openssl-3.0.0.patch +# PATCH-FIX-OPENSUSE qpid-oythonbuild.patch -- disable compiling with wrong interpreter +Patch1: qpid-pythonbuild.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module xml} @@ -45,6 +50,13 @@ BuildRequires: pkgconfig BuildRequires: python-rpm-macros BuildRequires: swig >= 2.0.9 +%if 0%{?python38_version_nodots} +# if python multiflavor is in place yet, use it to generate subpackages +%define python_subpackage_only 1 +%python_subpackages +%else +%define python_files() -n %python_prefix-%{**} +%endif %description Proton is a messaging library. It can be used in brokers, client @@ -112,14 +124,13 @@ This subpackage contains the documentation. -%if 0%{?have_python2} +# TODO: Remove the python2 shim as soon as the rpm-macros support python_subpackage_only. +%if 0%{?have_python2} && ! 0%{?python_subpackage_only} %package -n python2-python-qpid-proton Summary: Python language bindings for the Qpid Proton messaging framework Group: Development/Libraries/Python Requires: libqpid-proton%{qpid_proton_soversion} = %{version}-%{release} Requires: python = %{python2_version} -# NOTE: the name on pypi for the package is python-qpid-proton so the name -# for the RPM package should be python-python-qpid-proton (python-$pypi_name) Provides: python-qpid-proton = %{version} Obsoletes: python-qpid-proton < %{version} # as long as python2 is the default, provide also the non-versioned python pkg @@ -131,17 +142,22 @@ 1.0 messaging standard. %endif -%package -n python3-python-qpid-proton +%package -n %{python_flavor}-python-qpid-proton Summary: Python language bindings for the Qpid Proton messaging framework Group: Development/Libraries/Python Requires: libqpid-proton%{qpid_proton_soversion} = %{version}-%{release} -Requires: python = %{python3_version} +Requires: python = %{python_version} # NOTE: the name on pypi for the package is python-qpid-proton so the name -# for the RPM package should be python-python-qpid-proton (python-$pypi_name) +# for the RPM package should be <flavor>-python-qpid-proton (pythonXY-$pypi_name) +%if "%{python_flavor}" == "python2" +Provides: %{oldpython}-qpid-proton = %{version} +Obsoletes: %{oldpython}-qpid-proton < %{version} +%else Provides: python3-qpid-proton = %{version} Obsoletes: python3-qpid-proton < %{version} +%endif -%description -n python3-python-qpid-proton +%description -n %{python_flavor}-python-qpid-proton Proton is a messaging library. It can be used in brokers, client libraries, routers, bridges and proxies. Proton is based on the AMQP 1.0 messaging standard. @@ -159,16 +175,20 @@ -DCHECK_SYSINSTALL_PYTHON=0 %make_build all docs -# build for python2 and python3 -(cd python/dist; %python_build) +# build from the created sdist for all enabled python flavors +pushd python/dist +# Note: never python_expand in the root source tree. It removes the build/ directory +%python_build +popd %install %cmake_install -(cd build/python/dist; %python_install) -rm -rf %{buildroot}%{python3_sitearch}/__pycache__ +pushd build/python/dist +%python_install +%python_expand chmod +x %{buildroot}%{$python_sitearch}/*_cproton*.so +popd -chmod +x %{buildroot}%{python_sitearch}/*_cproton.so find %{buildroot}%{_datadir}/proton/examples/ -type f | xargs chmod -x mkdir -p %{buildroot}%{_docdir}/%{name} @@ -225,18 +245,20 @@ %{_docdir}/%{name}/api-c %{_docdir}/%{name}/api-cpp -%if 0%{?have_python2} +# only for non-multiple-flavor. TODO: Remove as soon as python_subpackage_only is supported +%if 0%{?have_python2} && ! 0%{?python_subpackage_only} %files -n python2-python-qpid-proton -%{python2_sitearch}/*_cproton.so +%{python2_sitearch}/*_cproton*.so %{python2_sitearch}/cproton.* %{python2_sitearch}/proton -%{python2_sitearch}/python_qpid_proton-%{version}-py*.egg-info +%{python2_sitearch}/python_qpid_proton-%{version}*-info %endif -%files -n python3-python-qpid-proton -%{python3_sitearch}/*_cproton*.so -%{python3_sitearch}/cproton.* -%{python3_sitearch}/proton -%{python3_sitearch}/python_qpid_proton-%{version}-py*.egg-info +%files %{python_files python-qpid-proton} +%{python_sitearch}/*_cproton*.so +%{python_sitearch}/cproton.py* +%pycache_only %{python_sitearch}/__pycache__/cproton* +%{python_sitearch}/proton +%{python_sitearch}/python_qpid_proton-%{version}*-info %changelog ++++++ qpid-proton-rpmlintrc ++++++ addFilter("qpid-proton-test.* devel-file-in-non-devel-package") ++++++ qpid-pythonbuild.patch ++++++ Index: qpid-proton-0.31.0/python/CMakeLists.txt =================================================================== --- qpid-proton-0.31.0.orig/python/CMakeLists.txt +++ qpid-proton-0.31.0/python/CMakeLists.txt @@ -115,8 +115,9 @@ macro (py_compile directory files artifa endforeach (src_file) endmacro(py_compile) -py_compile(${CMAKE_CURRENT_BINARY_DIR} ${pysrc-generated} CPROTON_ARTIFACTS) -py_compile(${CMAKE_CURRENT_SOURCE_DIR} "${pysrc}" PROTON_ARTIFACTS) +#Let setuptools do the compiling +#py_compile(${CMAKE_CURRENT_BINARY_DIR} ${pysrc-generated} CPROTON_ARTIFACTS) +#py_compile(${CMAKE_CURRENT_SOURCE_DIR} "${pysrc}" PROTON_ARTIFACTS) # Sphinx documentation check_python_module("sphinx" SPHINX_MODULE_FOUND) @@ -206,7 +207,8 @@ endforeach() # Make python source and binary packages if we have prerequisistes check_python_module("setuptools" SETUPTOOLS_MODULE_FOUND) -check_python_module("wheel" WHEEL_MODULE_FOUND) +#check_python_module("wheel" WHEEL_MODULE_FOUND) +set(WHEEL_MODULE_FOUND FALSE) if (SETUPTOOLS_MODULE_FOUND) add_custom_target(py_pkg_src ALL WORKING_DIRECTORY dist _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
