!3 update to version 1.12.0
Merge pull request !3 from sherlock2010/master
This commit is contained in:
commit
20cb6faa48
Binary file not shown.
BIN
librepo-1.12.0.tar.gz
Normal file
BIN
librepo-1.12.0.tar.gz
Normal file
Binary file not shown.
59
librepo.spec
59
librepo.spec
@ -1,14 +1,12 @@
|
|||||||
%global libcurl_version 7.28.0
|
%global libcurl_version 7.28.0
|
||||||
%global dnf_conflict 2.8.8
|
%global dnf_conflict 2.8.8
|
||||||
|
|
||||||
%bcond_without python3
|
|
||||||
%bcond_without pythontests
|
%bcond_without pythontests
|
||||||
%bcond_with python2
|
|
||||||
%bcond_with zchunk
|
%bcond_with zchunk
|
||||||
|
|
||||||
Name: librepo
|
Name: librepo
|
||||||
Version: 1.11.0
|
Version: 1.12.0
|
||||||
Release: 2
|
Release: 1
|
||||||
Summary: Repodata downloading library
|
Summary: Repodata downloading library
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: https://github.com/rpm-software-management/librepo
|
URL: https://github.com/rpm-software-management/librepo
|
||||||
@ -29,19 +27,6 @@ Requires: %{name} = %{version}-%{release}
|
|||||||
%description devel
|
%description devel
|
||||||
Development files for librepo.
|
Development files for librepo.
|
||||||
|
|
||||||
%if %{with python2}
|
|
||||||
%package -n python2-librepo
|
|
||||||
Summary: Python bindings for the librepo library
|
|
||||||
%{?python_provide:%python_provide python2-%{name}}
|
|
||||||
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-librepo
|
%package -n python3-librepo
|
||||||
Summary: Python 3 bindings for the librepo library
|
Summary: Python 3 bindings for the librepo library
|
||||||
%{?python_provide:%python_provide python3-%{name}}
|
%{?python_provide:%python_provide python3-%{name}}
|
||||||
@ -57,51 +42,24 @@ Python 3 bindings for the librepo library.
|
|||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
|
|
||||||
mkdir build-py2
|
|
||||||
mkdir build-py3
|
mkdir build-py3
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%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
|
|
||||||
popd
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{with python3}
|
|
||||||
pushd build-py3
|
pushd build-py3
|
||||||
%cmake -DPYTHON_DESIRED:FILEPATH=%{__python3} %{!?with_zchunk:-DWITH_ZCHUNK=OFF} -DENABLE_PYTHON_TESTS=%{?with_pythontests:ON}%{!?with_pythontests:OFF} ..
|
%cmake -DPYTHON_DESIRED:FILEPATH=%{__python3} %{!?with_zchunk:-DWITH_ZCHUNK=OFF} -DENABLE_PYTHON_TESTS=%{?with_pythontests:ON}%{!?with_pythontests:OFF} ..
|
||||||
%make_build
|
%make_build
|
||||||
popd
|
popd
|
||||||
%endif
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%if %{with python2}
|
|
||||||
pushd build-py2
|
|
||||||
#ctest -VV
|
|
||||||
make ARGS="-V" test
|
|
||||||
popd
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{with python3}
|
|
||||||
pushd build-py3
|
pushd build-py3
|
||||||
#ctest -VV
|
#ctest -VV
|
||||||
make ARGS="-V" test
|
make ARGS="-V" test
|
||||||
popd
|
popd
|
||||||
%endif
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%if %{with python2}
|
|
||||||
pushd build-py2
|
|
||||||
%make_install
|
|
||||||
popd
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{with python3}
|
|
||||||
pushd build-py3
|
pushd build-py3
|
||||||
%make_install
|
%make_install
|
||||||
popd
|
popd
|
||||||
%endif
|
|
||||||
|
|
||||||
%ldconfig_scriptlets
|
%ldconfig_scriptlets
|
||||||
|
|
||||||
@ -115,16 +73,15 @@ popd
|
|||||||
%{_libdir}/pkgconfig/%{name}.pc
|
%{_libdir}/pkgconfig/%{name}.pc
|
||||||
%{_includedir}/%{name}/
|
%{_includedir}/%{name}/
|
||||||
|
|
||||||
%if %{with python2}
|
|
||||||
%files -n python2-%{name}
|
|
||||||
%{python2_sitearch}/%{name}/
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{with python3}
|
|
||||||
%files -n python3-%{name}
|
%files -n python3-%{name}
|
||||||
%{python3_sitearch}/%{name}/
|
%{python3_sitearch}/%{name}/
|
||||||
%endif
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Apr 28 2020 zhouyihang <zhouyihang3@huawei.com> - 1.12.0-1
|
||||||
|
- Type:requirement
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:update librepo version to 1.12.0
|
||||||
|
|
||||||
* Tue Jan 7 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.11.0-2
|
* Tue Jan 7 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.11.0-2
|
||||||
- Pakcage init
|
- Pakcage init
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user