0.30.0-1

qpid-proton.spec

@@ -183,23 +183,6 @@ Obsoletes: qpid-proton-cpp-devel-docs
 %doc %{proton_datadir}/examples/cpp/tutorial.dox
 
 
-%package -n %{pythonx}-qpid-proton
-%{?python_provide:%python_provide python2-qpid-proton}
-Summary:  Python language bindings for the Qpid Proton messaging framework
-
-Requires: qpid-proton-c%{?_isa} = %{version}-%{release}
-Requires: %{pythonx}
-
-%description -n %{pythonx}-qpid-proton
-%{summary}.
-
-%files -n %{pythonx}-qpid-proton
-%defattr(-,root,root,-)
-%license %{proton_licensedir}/LICENSE.txt
-%license %{proton_licensedir}/licenses.xml
-%{python2_sitearch}/*
-
-
 %if 0%{?fedora} || 0%{?rhel} > 7
 %package -n python3-qpid-proton
 Summary:  Python language bindings for the Qpid Proton messaging framework
@@ -247,41 +230,6 @@ BuildArch: noarch
 
 %build
 
-mkdir buildpython2
-cd buildpython2
-
-%if 0%{?rhel} && 0%{?rhel} <= 7
-%cmake \
-       -DCMAKE_EXE_LINKER_FLAGS="-Wl,-z,relro,-z,now" \
-       -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-z,relro" \
-       -DCMAKE_MODULE_LINKER_FLAGS="-Wl,-z,relro" \
-       -DSYSINSTALL_BINDINGS=ON \
-       -DCMAKE_SKIP_RPATH:BOOL=OFF \
-       -DENABLE_FUZZ_TESTING=NO \
-       ..
-%endif
-
-%if 0%{?fedora} || 0%{?rhel} > 7
-export ADDCFLAGS=" -Wno-error=return-type"
-export ADDCXXFLAGS=" -Wno-error=format-security"
-%cmake \
-    -DSYSINSTALL_BINDINGS=ON \
-    -DCMAKE_SKIP_RPATH:BOOL=OFF \
-    -DENABLE_FUZZ_TESTING=NO \
-    "-DCMAKE_C_FLAGS=$CMAKE_C_FLAGS $CFLAGS $ADDCFLAGS" \
-    "-DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS $CXXFLAGS $ADDCXXFLAGS" \
-     -DPYTHON_EXECUTABLE=/usr/bin/python2.7 \
-     -DPYTHON_INCLUDE_DIR=/usr/include/python2.7/ \
-    "-DPYTHON_LIBRARY=%{_libdir}/libpython2.7.so" \
-    ..
-%endif
-
-#make all docs %{?_smp_mflags}
-make all docs -j1
-
-%if 0%{?fedora} || 0%{?rhel} > 7
-(cd python/dist; %py2_build)
-cd ..
 mkdir buildpython3
 cd buildpython3
 python_includes=$(ls -d /usr/include/python3*)
@@ -301,12 +249,7 @@ make all docs -j1
 %install
 rm -rf %{buildroot}
 
-cd buildpython2
+cd buildpython3
-%make_install
-%if 0%{?fedora} || 0%{?rhel} > 7
-(cd python/dist; %py2_install)
-
-cd ../buildpython3
 %make_install
 (cd python/dist; %py3_install)
 find %{buildroot}%{proton_datadir}/examples/python -name "*.py" -exec sed -i 's/!\/usr\/bin\/env python/!\/usr\/bin\/python3/' {} \;
@@ -401,6 +344,8 @@ rm -f  %{buildroot}%{proton_datadir}/CMakeLists.txt
 %changelog
 * Mon Jan 20 2020 Irina Boverman <iboverma@redhat.com> - 0.30.0-1
 - Rebased to 0.30.0
+- Removed python2--qpid-proton
+- Replaced epydoc with python3-sphinx
 
 * Thu Nov 14 2019 Björn Esser <besser82@fedoraproject.org> - 0.29.0-2
 - Rebuild (jsoncpp)