!3 update to version 0.48.0
Merge pull request !3 from sherlock2010/master
This commit is contained in:
commit
60cb929b1f
Binary file not shown.
BIN
libdnf-0.48.0.tar.gz
Normal file
BIN
libdnf-0.48.0.tar.gz
Normal file
Binary file not shown.
109
libdnf.spec
109
libdnf.spec
@ -1,17 +1,15 @@
|
||||
%global libsolv_version 0.7.7
|
||||
%global libmodulemd_version 1.6.1
|
||||
%global librepo_version 1.11.0
|
||||
%global dnf_conflict 4.2.13
|
||||
%global libmodulemd_version 2.5.0
|
||||
%global librepo_version 1.12.0
|
||||
%global dnf_conflict 4.2.23
|
||||
%global swig_version 3.0.12
|
||||
|
||||
%global requires_python2_sphinx python2-sphinx
|
||||
%global requires_python3_sphinx python3-sphinx
|
||||
|
||||
%bcond_with valgrind
|
||||
%bcond_without python3
|
||||
%bcond_with python2
|
||||
%bcond_with rhsm
|
||||
%bcond_with zchunk
|
||||
%bcond_with sanitizers
|
||||
|
||||
|
||||
%global _cmake_opts \\\
|
||||
@ -19,8 +17,8 @@
|
||||
%{nil}
|
||||
|
||||
Name: libdnf
|
||||
Version: 0.37.2
|
||||
Release: 2
|
||||
Version: 0.48.0
|
||||
Release: 1
|
||||
Summary: Library providing simplified C and Python API to libsolv
|
||||
License: LGPLv2+
|
||||
URL: https://github.com/rpm-software-management/libdnf
|
||||
@ -30,18 +28,16 @@ BuildRequires: pkgconfig(librepo) >= %{librepo_version} pkgconfig(ch
|
||||
BuildRequires: pkgconfig(gio-unix-2.0) >= 2.46.0 pkgconfig(gtk-doc) gpgme-devel
|
||||
BuildRequires: rpm-devel >= 4.11.0 pkgconfig(sqlite3) pkgconfig(smartcols)
|
||||
BuildRequires: pkgconfig(json-c) pkgconfig(cppunit) pkgconfig(libcrypto)
|
||||
BuildRequires: pkgconfig(modulemd) >= %{libmodulemd_version}
|
||||
BuildRequires: pkgconfig(modulemd-2.0) >= %{libmodulemd_version}
|
||||
|
||||
Requires: libmodulemd >= %{libmodulemd_version}
|
||||
Requires: libsolv >= %{libsolv_version}
|
||||
Requires: librepo >= %{librepo_version}
|
||||
|
||||
%if %{without python2}
|
||||
Obsoletes: python2-%{name} < %{version}-%{release}
|
||||
Obsoletes: python2-hawkey < %{version}-%{release}
|
||||
Obsoletes: python2-hawkey-debuginfo < %{version}-%{release}
|
||||
Obsoletes: python2-libdnf-debuginfo < %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%description
|
||||
A Library providing simplified C and Python API to libsolv.
|
||||
@ -54,21 +50,6 @@ Requires: libsolv-devel >= %{libsolv_version}
|
||||
%description devel
|
||||
Development files for %{name}.
|
||||
|
||||
%if %{with python2}
|
||||
%package -n python2-%{name}
|
||||
%{?python_provide:%python_provide python2-%{name}}
|
||||
Summary: Python 2 bindings for the libdnf library.
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildRequires: python2-devel swig >= %{swig_version}
|
||||
%if !0%{?mageia}
|
||||
BuildRequires: %{requires_python2_sphinx}
|
||||
%endif
|
||||
|
||||
%description -n python2-%{name}
|
||||
Python 2 bindings for the libdnf library.
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
%package -n python3-%{name}
|
||||
%{?python_provide:%python_provide python3-%{name}}
|
||||
Summary: Python 3 bindings for the libdnf library.
|
||||
@ -77,23 +58,7 @@ BuildRequires: python3-devel %{requires_python3_sphinx} swig >= %{sw
|
||||
|
||||
%description -n python3-%{name}
|
||||
Python 3 bindings for the libdnf library.
|
||||
%endif
|
||||
|
||||
%if %{with python2}
|
||||
%package -n python2-hawkey
|
||||
Summary: Python 2 bindings for the hawkey library
|
||||
%{?python_provide:%python_provide python2-hawkey}
|
||||
BuildRequires: python2-devel python2-nose
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: python2-%{name} = %{version}-%{release}
|
||||
Conflicts: python2-dnf < %{dnf_conflict}
|
||||
Conflicts: python-dnf < %{dnf_conflict}
|
||||
|
||||
%description -n python2-hawkey
|
||||
Python 2 bindings for the hawkey library.
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
%package -n python3-hawkey
|
||||
Summary: Python 3 bindings for the hawkey library
|
||||
%{?python_provide:%python_provide python3-hawkey}
|
||||
@ -105,63 +70,27 @@ Obsoletes: platform-python-hawkey < %{version}-%{release}
|
||||
|
||||
%description -n python3-hawkey
|
||||
Python 3 bindings for the hawkey library.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%autosetup
|
||||
%if %{with python2}
|
||||
mkdir build-py2
|
||||
%endif # with python2
|
||||
%if %{with python3}
|
||||
mkdir build-py3
|
||||
%endif
|
||||
|
||||
%build
|
||||
%if %{with python2}
|
||||
pushd build-py2
|
||||
%cmake -DPYTHON_DESIRED:FILEPATH=%{__python2} -DWITH_MAN=OFF ../ %{!?with_zchunk:-DWITH_ZCHUNK=OFF} %{!?with_valgrind:-DDISABLE_VALGRIND=1} %{_cmake_opts}
|
||||
%make_build
|
||||
popd
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
pushd build-py3
|
||||
%cmake -DPYTHON_DESIRED:FILEPATH=%{__python3} -DWITH_GIR=0 -DWITH_MAN=0 -Dgtkdoc=0 ../ %{!?with_zchunk:-DWITH_ZCHUNK=OFF} %{!?with_valgrind:-DDISABLE_VALGRIND=1} %{_cmake_opts}
|
||||
%cmake -DPYTHON_DESIRED:FILEPATH=%{__python3} -DWITH_GIR=0 -DWITH_MAN=0 -Dgtkdoc=0 ../ %{!?with_zchunk:-DWITH_ZCHUNK=OFF} %{!?with_valgrind:-DDISABLE_VALGRIND=1} %{_cmake_opts} \
|
||||
-DWITH_SANITIZERS=%{?with_sanitizers:ON}%{!?with_sanitizers:OFF}
|
||||
%make_build
|
||||
popd
|
||||
%endif
|
||||
|
||||
%check
|
||||
%if %{with python2}
|
||||
pushd build-py2
|
||||
make ARGS="-V" test
|
||||
popd
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
%if %{without python2}
|
||||
pushd build-py3
|
||||
make ARGS="-V" test
|
||||
popd
|
||||
%else
|
||||
pushd build-py3/python/hawkey/tests
|
||||
make ARGS="-V" test
|
||||
popd
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%install
|
||||
%if %{with python2}
|
||||
pushd build-py2
|
||||
%make_install
|
||||
popd
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
pushd build-py3
|
||||
%make_install
|
||||
popd
|
||||
%endif
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
@ -181,26 +110,18 @@ popd
|
||||
%{_libdir}/pkgconfig/%{name}.pc
|
||||
%{_includedir}/%{name}/
|
||||
|
||||
%if %{with python2}
|
||||
%files -n python2-%{name}
|
||||
%{python2_sitearch}/%{name}/
|
||||
%endif # with python2
|
||||
|
||||
%if %{with python3}
|
||||
%files -n python3-%{name}
|
||||
%{python3_sitearch}/%{name}/
|
||||
%endif
|
||||
|
||||
%if %{with python2}
|
||||
%files -n python2-hawkey
|
||||
%{python2_sitearch}/hawkey/
|
||||
%endif # with python2
|
||||
|
||||
%if %{with python3}
|
||||
%files -n python3-hawkey
|
||||
%{python3_sitearch}/hawkey/
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Apr 28 2020 zhouyihang <zhouyihang3@huawei.com> - 0.48.0-1
|
||||
- Type:requirement
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:update libdnf version to 0.48.0
|
||||
|
||||
* Tue Jan 7 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.37.2-2
|
||||
- Package init.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user