#6 Add WITH_ZCHUNK flag so LRO_SUPPORTS_CACHEDIR is set in librepo
Merged a day ago by pkratoch. Opened 23 days ago by jdieter.
rpms/ jdieter/libdnf f30  into  f30

@@ -0,0 +1,69 @@ 

+ diff --git a/CMakeLists.txt b/CMakeLists.txt

+ index 16b63308..c69026d1 100644

+ --- a/CMakeLists.txt

+ +++ b/CMakeLists.txt

+ @@ -30,6 +30,7 @@ option(WITH_BINDINGS "Enables python/SWIG bindings" ON)

+  option(WITH_GTKDOC "Enables libdnf GTK-Doc HTML documentation" ON)

+  option(WITH_HTML "Enables hawkey HTML generation" ON)

+  option(WITH_MAN "Enables hawkey man page generation" ON)

+ +option(WITH_ZCHUNK "Build with zchunk support" ON)

+  option(ENABLE_RHSM_SUPPORT "Build with Red Hat Subscription Manager support?" OFF)

+  option(ENABLE_SOLV_URPMREORDER "Build with support for URPM-like solution reordering?" OFF)

+  

+ @@ -66,6 +67,12 @@ pkg_check_modules(SQLite3 REQUIRED sqlite3)

+  # always enable linking with libdnf utils

+  include_directories(${CMAKE_SOURCE_DIR} libdnf/utils/)

+  

+ +if (WITH_ZCHUNK)

+ +    pkg_check_modules(ZCHUNKLIB zck>=0.9.11 REQUIRED)

+ +    set (CMAKE_CXX_FLAGS          "${CMAKE_CXX_FLAGS} -DWITH_ZCHUNK")

+ +    set (CMAKE_CXX_FLAGS_DEBUG    "${CMAKE_CXX_FLAGS_DEBUG} -DWITH_ZCHUNK")

+ +endif ()

+ +

+  if(ENABLE_RHSM_SUPPORT)

+      pkg_check_modules(RHSM REQUIRED librhsm>=0.0.3)

+      include_directories(${RHSM_INCLUDE_DIRS})

+ diff --git a/libdnf.spec b/libdnf.spec

+ index 60091ccf..2e1f958c 100644

+ --- a/libdnf.spec

+ +++ b/libdnf.spec

+ @@ -32,6 +32,12 @@

+  %bcond_with rhsm

+  %endif

+  

+ +%if 0%{?rhel}

+ +%bcond_with zchunk

+ +%else

+ +%bcond_without zchunk

+ +%endif

+ +

+  %global _cmake_opts \\\

+      -DENABLE_RHSM_SUPPORT=%{?with_rhsm:ON}%{!?with_rhsm:OFF} \\\

+      %{nil}

+ @@ -59,6 +65,9 @@ BuildRequires:  rpm-devel >= %{rpm_version}

+  %if %{with rhsm}

+  BuildRequires:  pkgconfig(librhsm) >= 0.0.3

+  %endif

+ +%if %{with zchunk}

+ +BuildRequires:  pkgconfig(zck) >= 0.9.11

+ +%endif

+  BuildRequires:  pkgconfig(sqlite3)

+  BuildRequires:  pkgconfig(json-c)

+  BuildRequires:  pkgconfig(cppunit)

+ @@ -175,14 +184,14 @@ mkdir build-py3

+  %build

+  %if %{with python2}

+  pushd build-py2

+ -  %cmake -DPYTHON_DESIRED:FILEPATH=%{__python2} -DWITH_MAN=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}

+    %make_build

+  popd

+  %endif # with python2

+  

+  %if %{with python3}

+  pushd build-py3

+ -  %cmake -DPYTHON_DESIRED:FILEPATH=%{__python3} -DWITH_GIR=0 -DWITH_MAN=0 -Dgtkdoc=0 ../ %{!?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}

+    %make_build

+  popd

+  %endif

file modified
+18 -3

@@ -32,13 +32,19 @@ 

  %bcond_with rhsm

  %endif

  

+ %if 0%{?rhel}

+ %bcond_with zchunk

+ %else

+ %bcond_without zchunk

+ %endif

+ 

  %global _cmake_opts \\\

      -DENABLE_RHSM_SUPPORT=%{?with_rhsm:ON}%{!?with_rhsm:OFF} \\\

      %{nil}

  

  Name:           libdnf

  Version:        0.35.2

- Release:        3%{?dist}

+ Release:        4%{?dist}

  Summary:        Library providing simplified C and Python API to libsolv

  License:        LGPLv2+

  URL:            https://github.com/rpm-software-management/libdnf

@@ -54,6 +60,9 @@ 

  Patch0004:      0004-hy_detect_arch-detect-crypto-only-on-arm-version--8.patch

  Patch0005:      0004-Mark-job-goalupgrade-with-sltr-as-targeted.patch

  Patch0006:      0005-Apply-targeted-upgrade-only-for-selector-with-packages.patch

+ # Temporary until patch is upstreamed

+ # https://bugzilla.redhat.com/show_bug.cgi?id=1739867

+ Patch0007:      libdnf-0.35-fix-zchunk.patch

  

  BuildRequires:  cmake

  BuildRequires:  gcc

@@ -70,6 +79,9 @@ 

  %if %{with rhsm}

  BuildRequires:  pkgconfig(librhsm) >= 0.0.3

  %endif

+ %if %{with zchunk}

+ BuildRequires:  pkgconfig(zck) >= 0.9.11

+ %endif

  BuildRequires:  pkgconfig(sqlite3)

  BuildRequires:  pkgconfig(json-c)

  BuildRequires:  pkgconfig(cppunit)

@@ -186,14 +198,14 @@ 

  %build

  %if %{with python2}

  pushd build-py2

-   %cmake -DPYTHON_DESIRED:FILEPATH=%{__python2} -DWITH_MAN=OFF ../ %{!?with_valgrind:-DDISABLE_VALGRIND=1} %{_cmake_opts}

+   %cmake -DPYTHON_DESIRED:FILEPATH=%{__python2} -DWITH_MAN=OFF ../ %{!?with_valgrind:-DDISABLE_VALGRIND=1} %{!?with_zchunk:-DWITH_ZCHUNK=OFF} %{_cmake_opts}

    %make_build

  popd

  %endif # with python2

  

  %if %{with python3}

  pushd build-py3

-   %cmake -DPYTHON_DESIRED:FILEPATH=%{__python3} -DWITH_GIR=0 -DWITH_MAN=0 -Dgtkdoc=0 ../ %{!?with_valgrind:-DDISABLE_VALGRIND=1} %{_cmake_opts}

+   %cmake -DPYTHON_DESIRED:FILEPATH=%{__python3} -DWITH_GIR=0 -DWITH_MAN=0 -Dgtkdoc=0 ../ %{!?with_valgrind:-DDISABLE_VALGRIND=1} %{!?with_zchunk:-DWITH_ZCHUNK=OFF} %{_cmake_opts}

    %make_build

  popd

  %endif

@@ -276,6 +288,9 @@ 

  %endif

  

  %changelog

+ * Sat Sep 14 2019 Jonathan Dieter <jdieter@gmail.com> - 0.35.2-4

+ - Rebuild for zchunk enabled librepo

+ 

  * Wed Sep 11 2019 Jaroslav Mracek <jmracek@redhat.com> - 0.35.2-3

  - Backport patch to fix reinstalling packages with a different buildtime - part II

  

This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1739867. This branch is an older version of libdnf than master, so it can't be FF merged.

1 new commit added

  • Default for WITH_ZCHUNK is ON
23 days ago

1 new commit added

  • Update to final patch as was merged into libdnf
13 days ago

Scratch build:
https://koji.fedoraproject.org/koji/taskinfo?taskID=37444011

Tested the scratch build locally and have verified that it works

rebased onto 0019f41

2 days ago

3 new commits added

  • Update to final patch as was merged into libdnf
  • Default for WITH_ZCHUNK is ON
  • Add WITH_ZCHUNK flag so LRO_SUPPORTS_CACHEDIR is set in librepo
2 days ago

I've rebased against latest f30. Can we please get this pulled?

Pull-Request has been merged by pkratoch

a day ago