diff --git a/fix-python2-no-format-arguments-error.patch b/fix-python2-no-format-arguments-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..3a0c6bd03c09dc5527118302d4c1412b46ae666f --- /dev/null +++ b/fix-python2-no-format-arguments-error.patch @@ -0,0 +1,12 @@ +diff -urNp a/python/hawkey/exception-py.hpp b/python/hawkey/exception-py.hpp +--- a/python/hawkey/exception-py.hpp 2020-06-02 17:41:46.000000000 +0800 ++++ b/python/hawkey/exception-py.hpp 2020-08-31 10:28:07.000000000 +0800 +@@ -37,7 +37,7 @@ PyObject *op_error2exc(const GError *err + int ret2e(int ret, const char *msg); + + #define CATCH_TO_PYTHON_RET(RET) catch (const libdnf::Error& e) { \ +- PyErr_Format(HyExc_Exception, e.what()); \ ++ PyErr_Format(HyExc_Exception, "%s", e.what()); \ + return RET; \ + } + diff --git a/libdnf-0.37.2.tar.gz b/libdnf-0.37.2.tar.gz deleted file mode 100644 index 58bf7416f04776721250c05752a28bd9e1fd169d..0000000000000000000000000000000000000000 Binary files a/libdnf-0.37.2.tar.gz and /dev/null differ diff --git a/libdnf-0.48.0.tar.gz b/libdnf-0.48.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ceccfb4e09b3543a6df52909d1d05f60605636b2 Binary files /dev/null and b/libdnf-0.48.0.tar.gz differ diff --git a/libdnf.spec b/libdnf.spec index 56d747ea90c6d19e60381e4852938ec00af23f8a..2c6975b34321b43c5c674747d01bd2468379a59a 100644 --- a/libdnf.spec +++ b/libdnf.spec @@ -1,7 +1,7 @@ %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 @@ -12,25 +12,34 @@ %bcond_with python2 %bcond_with rhsm %bcond_with zchunk - +%bcond_with sanitizers %global _cmake_opts \\\ -DENABLE_RHSM_SUPPORT=%{?with_rhsm:ON}%{!?with_rhsm:OFF} \\\ %{nil} Name: libdnf -Version: 0.37.2 -Release: 3 +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 Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz + +Patch0000: fix-python2-no-format-arguments-error.patch + BuildRequires: cmake gcc gcc-c++ libsolv-devel >= %{libsolv_version} gettext BuildRequires: pkgconfig(librepo) >= %{librepo_version} pkgconfig(check) 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} + +%if %{with sanitizers} +BuildRequires: libasan-static +BuildRequires: liblsan-static +BuildRequires: libubsan-static +%endif Requires: libmodulemd >= %{libmodulemd_version} Requires: libsolv >= %{libsolv_version} @@ -108,10 +117,10 @@ Python 3 bindings for the hawkey library. %endif %prep -%autosetup +%autosetup -p1 %if %{with python2} mkdir build-py2 -%endif # with python2 +%endif %if %{with python3} mkdir build-py3 %endif @@ -119,14 +128,16 @@ mkdir build-py3 %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} + %cmake -DPYTHON_DESIRED:FILEPATH=%{__python2} -DWITH_MAN=OFF ../ %{!?with_zchunk:-DWITH_ZCHUNK=OFF} %{!?with_valgrind:-DDISABLE_VALGRIND=1} %{_cmake_opts} \ + -DWITH_SANITIZERS=%{?with_sanitizers:ON}%{!?with_sanitizers:OFF} %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 @@ -184,7 +195,7 @@ popd %if %{with python2} %files -n python2-%{name} %{python2_sitearch}/%{name}/ -%endif # with python2 +%endif %if %{with python3} %files -n python3-%{name} @@ -194,7 +205,7 @@ popd %if %{with python2} %files -n python2-hawkey %{python2_sitearch}/hawkey/ -%endif # with python2 +%endif %if %{with python3} %files -n python3-hawkey @@ -202,6 +213,12 @@ popd %endif %changelog +* Sat Aug 29 2020 openEuler Buildteam - 0.48.0-1 +- Type:requirement +- ID:NA +- SUG:NA +- DESC:upgrade to 0.48.0 + * Tue Aug 18 2020 chenyaqiang - 0.37.2-3 - rebuild for package build