#5 Add WITH_ZCHUNK flag so LRO_SUPPORTS_CACHEDIR is set in librepo (f31)
Closed a month ago by pkratoch. Opened 2 months ago by jdieter.
rpms/ jdieter/libdnf f31  into  f31

@@ -23,3 +23,47 @@ 

   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
+1 -1

@@ -72,7 +72,7 @@ 

  BuildRequires:  pkgconfig(librhsm) >= 0.0.3

  %endif

  %if %{with zchunk}

- BuildRequires:  zchunk-devel >= 0.9.11

+ BuildRequires:  pkgconfig(zck) >= 0.9.11

  %endif

  BuildRequires:  pkgconfig(sqlite3)

  BuildRequires:  pkgconfig(json-c)

This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1739867. If PR #4 is merged, you can just do a FF merge to master on this branch instead of merging this.

1 new commit added

  • Default for WITH_ZCHUNK is ON
2 months ago

1 new commit added

  • Update to final patch as it was merged into libdnf
2 months ago

rebased onto c004d11

a month ago

rebased onto fc27f18

a month ago

Can we please do a FF merge after merging the PR for master and build this for F31?

rebased onto cee00b2

a month ago

I made a FF merge to master, so I am closing this PR.

Pull-Request has been closed by pkratoch

a month ago