diff --git a/librepo-1.18.0.tar.gz b/librepo-1.18.0.tar.gz deleted file mode 100644 index 283390c81c7277aadd6dff3ad7d27236249cb738..0000000000000000000000000000000000000000 Binary files a/librepo-1.18.0.tar.gz and /dev/null differ diff --git a/librepo-1.18.1.tar.gz b/librepo-1.18.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..70e059694fc5102ce7c0aacd39940c09c0aa596b Binary files /dev/null and b/librepo-1.18.1.tar.gz differ diff --git a/librepo-gpgme-config.patch b/librepo-gpgme-config.patch new file mode 100644 index 0000000000000000000000000000000000000000..e89964ee1ace5d9c804106f71c07435798d3ba11 --- /dev/null +++ b/librepo-gpgme-config.patch @@ -0,0 +1,24 @@ +diff -aur librepo-1.17.0.old/CMakeLists.txt librepo-1.17.0/CMakeLists.txt +--- librepo-1.17.0.old/CMakeLists.txt 2024-03-25 21:20:16.874681785 +0100 ++++ librepo-1.17.0/CMakeLists.txt 2024-03-25 21:20:42.054785557 +0100 +@@ -37,7 +37,7 @@ + FIND_PACKAGE(CURL 7.52.0 REQUIRED) + + IF (USE_GPGME) +- FIND_PACKAGE(Gpgme REQUIRED) ++ PKG_SEARCH_MODULE(GPGME REQUIRED gpgme) + IF (ENABLE_SELINUX) + PKG_CHECK_MODULES(SELINUX REQUIRED libselinux) + ENDIF(ENABLE_SELINUX) +diff -aur librepo-1.17.0.old/librepo/CMakeLists.txt librepo-1.17.0/librepo/CMakeLists.txt +--- librepo-1.17.0.old/librepo/CMakeLists.txt 2024-03-25 21:20:16.874681785 +0100 ++++ librepo-1.17.0/librepo/CMakeLists.txt 2024-03-25 21:21:00.624861703 +0100 +@@ -70,7 +70,7 @@ + ${GLIB2_LIBRARIES} + ) + IF (USE_GPGME) +- TARGET_LINK_LIBRARIES(librepo ${GPGME_VANILLA_LIBRARIES}) ++ TARGET_LINK_LIBRARIES(librepo ${GPGME_LIBRARIES}) + IF (ENABLE_SELINUX) + TARGET_LINK_LIBRARIES(librepo ${SELINUX_LIBRARIES}) + ENDIF(ENABLE_SELINUX) diff --git a/librepo.spec b/librepo.spec index f6999900e14773d19916c2c6d883dc1805a27284..859b0a9bb0159e656d001988fc0f5ef6b1511469 100644 --- a/librepo.spec +++ b/librepo.spec @@ -5,17 +5,29 @@ %bcond_with zchunk Name: librepo -Version: 1.18.0 +Version: 1.18.1 Release: 1 Summary: Repodata downloading library License: LGPL-2.0-or-later 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} +# https://github.com/rpm-software-management/librepo/issues/269 +Patch0: librepo-gpgme-config.patch +BuildRequires: gcc cmake +BuildRequires: pkgconfig(check) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(glib-2.0) >= 2.66 +BuildRequires: pkgconfig(gpgme) +BuildRequires: pkgconfig(libcrypto) +BuildRequires: pkgconfig(libcurl) >= %{libcurl_version} +BuildRequires: pkgconfig(libselinux) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(openssl) +BuildRequires: doxygen +%if %{with zchunk} +BuildRequires: pkgconfig(zck) >= 0.9.11 +%endif +Requires: libcurl >= %{libcurl_version} %description A library providing C and Python (libcURL like) API to downloading repository @@ -43,9 +55,8 @@ Python 3 bindings for the librepo library. %prep %autosetup -p1 -mkdir build-py3 - %build +mkdir build-py3 pushd build-py3 %cmake -DPYTHON_DESIRED:FILEPATH=%{__python3} %{!?with_zchunk:-DWITH_ZCHUNK=OFF} -DENABLE_PYTHON_TESTS=%{?with_pythontests:ON}%{!?with_pythontests:OFF} .. %make_build @@ -53,8 +64,7 @@ popd %check pushd build-py3 - #ctest -VV - make ARGS="-V" test + ctest -VV popd %install @@ -62,8 +72,6 @@ pushd build-py3 %make_install popd -%ldconfig_scriptlets - %files %license COPYING %doc README.md @@ -78,6 +86,9 @@ popd %{python3_sitearch}/%{name}/ %changelog +* Sat Aug 17 2024 Funda Wang - 1.18.1-1 +- update to 1.18.1 + * Tue Jul 30 2024 dillon chen - 1.18.0-1 - update to 1.18.0