diff --git a/librepo-1.11.0.tar.gz b/librepo-1.11.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..5aa000874503d6339a3b930f14ede9d9830c0ee7 Binary files /dev/null and b/librepo-1.11.0.tar.gz differ diff --git a/librepo-1.9.1.tar.gz b/librepo-1.9.1.tar.gz deleted file mode 100644 index 51eab07553239b15cab96fd3759c5ea2a34e67c2..0000000000000000000000000000000000000000 Binary files a/librepo-1.9.1.tar.gz and /dev/null differ diff --git a/librepo.spec b/librepo.spec index 9c0fee6d2c11c2089565e18495d4d43dda826690..f6341a3ff31e2ba33b28c421def587e8a3f5f5f2 100644 --- a/librepo.spec +++ b/librepo.spec @@ -1,51 +1,57 @@ +%global libcurl_version 7.28.0 %global dnf_conflict 2.8.8 -Name: librepo -Version: 1.9.1 -Release: 2 -Summary: Repodata downloading library -License: LGPLv2.1 -URL: https://github.com/rpm-software-management/librepo -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz - -BuildRequires: cmake gcc doxygen pkgconfig(glib-2.0) -BuildRequires: check-devel gpgme-devel libattr-devel -BuildRequires: libcurl-devel >= 7.19.0 -BuildRequires: pkgconfig(libxml-2.0) pkgconfig(libcrypto) pkgconfig(openssl) +%bcond_without python3 +%bcond_without pythontests +%bcond_with python2 +%bcond_with zchunk + +Name: librepo +Version: 1.11.0 +Release: 2 +Summary: Repodata downloading library +License: LGPLv2+ +URL: https://github.com/rpm-software-management/librepo +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +BuildRequires: cmake check-devel doxygen pkgconfig(glib-2.0) gcc +BuildRequires: libcurl-devel >= %{libcurl_version} pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(openssl) gpgme-devel libattr-devel pkgconfig(libcrypto) +Requires: libcurl >= %{libcurl_version} %description -A library providing C and Python (libcURL like) API to downloading packages -and linux repository metadata in rpm-md format. +A library providing C and Python (libcURL like) API to downloading repository +metadata. -%package devel -Summary: Repodata downloading library -Requires: %{name}%{?_isa} = %{version}-%{release} +%package devel +Summary: Repodata downloading library +Requires: %{name} = %{version}-%{release} %description devel Development files for librepo. -%package -n python2-%{name} -Summary: Python 2 bindings for the librepo library +%if %{with python2} +%package -n python2-librepo +Summary: Python bindings for the librepo library %{?python_provide:%python_provide python2-%{name}} -BuildRequires: python2-gpg python2-devel python2-flask -BuildRequires: python2-nose python2-sphinx python2-pyxattr -Requires: %{name}%{?_isa} = %{version}-%{release} -Obsoletes: platform-python-%{name} < %{version}-%{release} -Conflicts: python2-dnf < %{dnf_conflict} +BuildRequires: python2-sphinx python2-devel python2-flask python2-nose +BuildRequires: python2-requests python2-pyxattr python2-gpg +Requires: %{name} = %{version}-%{release} +Conflicts: python2-dnf < %{dnf_conflict} %description -n python2-%{name} Python 2 bindings for the librepo library. +%endif -%package -n python3-%{name} -Summary: Python 3 bindings for the librepo library +%package -n python3-librepo +Summary: Python 3 bindings for the librepo library %{?python_provide:%python_provide python3-%{name}} -BuildRequires: python3-gpg python3-devel python3-flask -BuildRequires: python3-nose python3-sphinx python3-pyxattr -Requires: %{name}%{?_isa} = %{version}-%{release} -Obsoletes: platform-python-%{name} < %{version}-%{release} -Conflicts: python3-dnf < %{dnf_conflict} +BuildRequires: python3-devel python3-gpg python3-flask python3-nose +BuildRequires: python3-pyxattr python3-requests python3-sphinx +Requires: %{name} = %{version}-%{release} +Obsoletes: platform-python-%{name} < %{version}-%{release} +Conflicts: python3-dnf < %{dnf_conflict} -%description -n python3-%{name} +%description -n python3-%{name} Python 3 bindings for the librepo library. %prep @@ -55,35 +61,47 @@ mkdir build-py2 mkdir build-py3 %build -cd build-py2 - %cmake -DPYTHON_DESIRED:FILEPATH=%{__python2} .. +%if %{with python2} +pushd build-py2 + %cmake -DPYTHON_DESIRED:FILEPATH=%{__python2} %{!?with_zchunk:-DWITH_ZCHUNK=OFF} -DENABLE_PYTHON_TESTS=%{?with_pythontests:ON}%{!?with_pythontests:OFF} .. %make_build -cd .. - +popd +%endif -cd build-py3 - %cmake -DPYTHON_DESIRED:FILEPATH=%{__python3} .. +%if %{with python3} +pushd build-py3 + %cmake -DPYTHON_DESIRED:FILEPATH=%{__python3} %{!?with_zchunk:-DWITH_ZCHUNK=OFF} -DENABLE_PYTHON_TESTS=%{?with_pythontests:ON}%{!?with_pythontests:OFF} .. %make_build -cd .. +popd +%endif %check -cd build-py2 +%if %{with python2} +pushd build-py2 + #ctest -VV make ARGS="-V" test -cd .. +popd +%endif - -cd build-py3 +%if %{with python3} +pushd build-py3 + #ctest -VV make ARGS="-V" test -cd .. +popd +%endif %install -cd build-py2 +%if %{with python2} +pushd build-py2 %make_install -cd .. +popd +%endif -cd build-py3 +%if %{with python3} +pushd build-py3 %make_install -cd .. +popd +%endif %ldconfig_scriptlets @@ -97,15 +115,16 @@ cd .. %{_libdir}/pkgconfig/%{name}.pc %{_includedir}/%{name}/ +%if %{with python2} %files -n python2-%{name} %{python2_sitearch}/%{name}/ +%endif +%if %{with python3} %files -n python3-%{name} %{python3_sitearch}/%{name}/ +%endif %changelog -* Sat Dec 21 2019 openEuler Buildteam - 1.9.1-2 -- Support python2 - -* Fri Aug 17 2018 openEuler Buildteam - 1.9.1-1 -- Package init +* Tue Jan 7 2020 openEuler Buildteam - 1.11.0-2 +- Pakcage init