diff --git a/hawkey.spec b/hawkey.spec index 33c5d34..20e1509 100644 --- a/hawkey.spec +++ b/hawkey.spec @@ -1,14 +1,8 @@ %global libsolv_version 0.6.4-1 -%if 0%{?rhel} && 0%{?rhel} <= 7 -%bcond_with python3 -%else -%bcond_without python3 -%endif - Name: hawkey Version: 0.6.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Library providing simplified C and Python API to libsolv License: LGPLv2+ URL: https://github.com/rpm-software-management/%{name} @@ -42,72 +36,23 @@ Requires: libsolv-devel %description devel Development files for hawkey. -%package -n python2-%{name} -Summary: Python 2 bindings for the hawkey library -%{?python_provide:%python_provide python2-%{name}} -BuildRequires: python2-devel -%if 0%{?rhel} && 0%{?rhel} <= 7 -BuildRequires: python-nose -%else -BuildRequires: python2-nose -%endif -%if (0%{?rhel} && 0%{?rhel} <= 7) || (0%{?fedora} && 0%{?fedora} <= 23) -BuildRequires: python-sphinx -%else -BuildRequires: python2-sphinx -%endif -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description -n python2-%{name} -Python 2 bindings for the hawkey library. - -%if %{with python3} -%package -n python3-%{name} -Summary: Python 3 bindings for the hawkey library -%{?system_python_abi} -%{?python_provide:%python_provide python3-%{name}} -BuildRequires: python3-devel -BuildRequires: python3-nose -BuildRequires: python3-sphinx -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description -n python3-%{name} -Python 3 bindings for the hawkey library. -%endif - %prep %autosetup -p1 - -mkdir build - -%if %{with python3} -mkdir build-py3 -%endif +sed -i -e "/python/d" -e "/PYTHON/d" {src,tests}/CMakeLists.txt +sed -i -e "/ADD_SUBDIRECTORY (doc)/d" CMakeLists.txt %build -pushd build - %cmake ../ +mkdir %{_target_platform} +pushd %{_target_platform} + %cmake .. %make_build - make doc-man + #make doc-man popd -%if %{with python3} -pushd build-py3 - %cmake ../ -DPYTHON_DESIRED:str=3 - %make_build - make doc-man -popd -%endif - %install -pushd build +pushd %{_target_platform} %make_install popd -%if %{with python3} -pushd build-py3 - %make_install -popd -%endif %check if [ "$(id -u)" == "0" ] ; then @@ -117,16 +62,9 @@ Please build the package as non-root user. ERROR exit 1 fi -pushd build +pushd %{_target_platform} ctest -VV popd -%if %{with python3} -# Run just the Python tests, not all of them, since -# we have coverage of the core from the first build -pushd build-py3/tests/python - ctest -VV -popd -%endif %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -140,17 +78,11 @@ popd %{_libdir}/lib%{name}.so %{_libdir}/pkgconfig/%{name}.pc %{_includedir}/%{name}/ -%{_mandir}/man3/%{name}.3* - -%files -n python2-%{name} -%{python2_sitearch}/%{name}/ - -%if %{with python3} -%files -n python3-%{name} -%{python3_sitearch}/%{name}/ -%endif %changelog +* Thu Jan 05 2017 Igor Gnatenko - 0.6.3-8 +- Stop providing python subpackages + * Tue Dec 13 2016 Stratakis Charalampos - 0.6.3-7 - Rebuild for Python 3.6