Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package createrepo_c for openSUSE:Factory checked in at 2026-02-10 21:10:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/createrepo_c (Old) and /work/SRC/openSUSE:Factory/.createrepo_c.new.1670 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "createrepo_c" Tue Feb 10 21:10:38 2026 rev:25 rq:1331782 version:1.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/createrepo_c/createrepo_c.changes 2025-04-20 19:50:56.146295011 +0200 +++ /work/SRC/openSUSE:Factory/.createrepo_c.new.1670/createrepo_c.changes 2026-02-10 21:10:39.719136667 +0100 @@ -1,0 +2,10 @@ +Tue Jan 27 15:27:55 UTC 2026 - Dominique Leuenberger <[email protected]> + +- Update to version 1.2.2: + + Don't try to use imported targets of turned-off dependencies + + cmake: Allow builds without Doxygen being present with CMake 4+ + + Use RPMTAG_SHA1HEADER instead of RPMTAG_HDRID + + Do not build python docs unless python is enabled +- Drop createrepo_c-1.2.1-cmake4.patch: fixed upstream. + +------------------------------------------------------------------- Old: ---- createrepo_c-1.2.1-cmake4.patch createrepo_c-1.2.1.tar.gz New: ---- createrepo_c-1.2.2.tar.gz ----------(Old B)---------- Old: + Do not build python docs unless python is enabled - Drop createrepo_c-1.2.1-cmake4.patch: fixed upstream. ----------(Old E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ createrepo_c.spec ++++++ --- /var/tmp/diff_new_pack.g6tQSr/_old 2026-02-10 21:10:40.435166672 +0100 +++ /var/tmp/diff_new_pack.g6tQSr/_new 2026-02-10 21:10:40.435166672 +0100 @@ -1,7 +1,7 @@ # # spec file for package createrepo_c # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # Copyright (c) 2022 Neal Gompa <[email protected]>. # Copyright (c) 2025 Andreas Stieger <[email protected]> # @@ -45,16 +45,13 @@ %bcond_without as_createrepo %endif Name: createrepo_c -Version: 1.2.1 +Version: 1.2.2 Release: 0 Summary: RPM repository metadata generation utility License: GPL-2.0-or-later Group: System/Packages URL: https://github.com/rpm-software-management/createrepo_c Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# part of https://github.com/rpm-software-management/createrepo_c/pull/438 -# accidentally also fixes boo#1239788 -Patch0: createrepo_c-1.2.1-cmake4.patch BuildRequires: bash-completion BuildRequires: cmake >= 3.7.0 BuildRequires: doxygen ++++++ createrepo_c-1.2.1.tar.gz -> createrepo_c-1.2.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/createrepo_c-1.2.1/.github/workflows/ci-python.yml new/createrepo_c-1.2.2/.github/workflows/ci-python.yml --- old/createrepo_c-1.2.1/.github/workflows/ci-python.yml 2025-03-17 08:14:47.000000000 +0100 +++ new/createrepo_c-1.2.2/.github/workflows/ci-python.yml 2026-01-19 08:23:36.000000000 +0100 @@ -8,7 +8,7 @@ runs-on: ubuntu-latest container: fedora:latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install dependencies run: | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/createrepo_c-1.2.1/.github/workflows/ci.yml new/createrepo_c-1.2.2/.github/workflows/ci.yml --- old/createrepo_c-1.2.1/.github/workflows/ci.yml 2025-03-17 08:14:47.000000000 +0100 +++ new/createrepo_c-1.2.2/.github/workflows/ci.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,57 +0,0 @@ ---- -name: DNF CI -on: pull_request_target - -jobs: - copr-build: - name: Copr Build - runs-on: ubuntu-latest - container: - image: ghcr.io/rpm-software-management/dnf-ci-host - outputs: - package-urls: ${{steps.copr-build.outputs.package-urls}} - steps: - - name: Check out ci-dnf-stack - uses: actions/checkout@v2 - with: - repository: rpm-software-management/ci-dnf-stack - - - name: Setup CI - id: setup-ci - uses: ./.github/actions/setup-ci - with: - copr-user: ${{secrets.COPR_USER}} - copr-api-token: ${{secrets.COPR_API_TOKEN}} - - - name: Check out sources - uses: actions/checkout@v2 - with: - path: gits/${{github.event.repository.name}} - ref: ${{github.event.pull_request.head.sha}} # check out the PR HEAD - fetch-depth: 0 - - - name: Run Copr Build - id: copr-build - uses: ./.github/actions/copr-build - with: - copr-user: ${{steps.setup-ci.outputs.copr-user}} - overlay: createrepo_c-ci - - integration-tests: - name: Integration Tests - needs: copr-build - runs-on: ubuntu-latest - container: - image: ghcr.io/rpm-software-management/dnf-ci-host - options: --privileged - steps: - - name: Check out ci-dnf-stack - uses: actions/checkout@v2 - with: - repository: rpm-software-management/ci-dnf-stack - - - name: Run Integration Tests - uses: ./.github/actions/integration-tests - with: - suite: createrepo_c - package-urls: ${{needs.copr-build.outputs.package-urls}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/createrepo_c-1.2.1/.github/workflows/release-python.yml new/createrepo_c-1.2.2/.github/workflows/release-python.yml --- old/createrepo_c-1.2.1/.github/workflows/release-python.yml 2025-03-17 08:14:47.000000000 +0100 +++ new/createrepo_c-1.2.2/.github/workflows/release-python.yml 2026-01-19 08:23:36.000000000 +0100 @@ -31,37 +31,33 @@ - uses: actions/upload-artifact@v4 with: + name: source path: dist/*.tar.gz build_bdist: name: Build binary wheels - runs-on: ubuntu-latest strategy: matrix: include: - - arch: auto64 # native 64-bit - - arch: aarch64 - # TODO: when github actions gets native aarch64 runners, ditch qemu, it will be much faster + - os: ubuntu-24.04 + arch: x86_64 + - os: ubuntu-24.04-arm + arch: aarch64 + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 # setup Python for cibuildwheel - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.x' - - name: Set up QEMU - if: runner.os == 'Linux' && ${{ matrix.arch }} == "aarch64" - uses: docker/setup-qemu-action@v3 - with: - platforms: arm64 - - name: Build wheels for CPython - uses: pypa/[email protected] + uses: pypa/[email protected] env: - CIBW_ARCHS: ${{ matrix.arch }} + CIBW_ARCHS: auto64 CIBW_SKIP: "pp* *-musllinux_* cp36* cp37* cp38*" # no PyPy or musl builds, no older Python versions CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28 # alma 8 CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28 @@ -73,6 +69,7 @@ - uses: actions/upload-artifact@v4 with: + name: ${{ matrix.arch }} path: ./wheelhouse/*.whl @@ -84,10 +81,10 @@ steps: - uses: actions/download-artifact@v4 with: - name: artifact + merge-multiple: true path: dist - - uses: pypa/[email protected] + - uses: pypa/[email protected] with: user: __token__ password: ${{secrets.PYPI_API_TOKEN}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/createrepo_c-1.2.1/.packit.yaml new/createrepo_c-1.2.2/.packit.yaml --- old/createrepo_c-1.2.1/.packit.yaml 2025-03-17 08:14:47.000000000 +0100 +++ new/createrepo_c-1.2.2/.packit.yaml 2026-01-19 08:23:36.000000000 +0100 @@ -7,11 +7,14 @@ - job: copr_build trigger: pull_request targets: + - epel-9 + - epel-10 - fedora-all - job: tests trigger: pull_request identifier: "createrepo_c-tests" targets: + # EPELs fail now for unrelated reasons - fedora-all fmf_url: https://github.com/rpm-software-management/ci-dnf-stack.git fmf_ref: enable-tmt-dnf-4-stack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/createrepo_c-1.2.1/AUTHORS new/createrepo_c-1.2.2/AUTHORS --- old/createrepo_c-1.2.1/AUTHORS 2025-03-17 08:14:47.000000000 +0100 +++ new/createrepo_c-1.2.2/AUTHORS 2026-01-19 08:23:36.000000000 +0100 @@ -11,3 +11,4 @@ Frank Schreiner <[email protected]> Daniel Alley <[email protected]> Matt Jolly <[email protected]> +Moritz Haase <moritz.haase at bmw dot de> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/createrepo_c-1.2.1/CMakeLists.txt new/createrepo_c-1.2.2/CMakeLists.txt --- old/createrepo_c-1.2.1/CMakeLists.txt 2025-03-17 08:14:47.000000000 +0100 +++ new/createrepo_c-1.2.2/CMakeLists.txt 2026-01-19 08:23:36.000000000 +0100 @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED (VERSION 2.8.12) +CMAKE_MINIMUM_REQUIRED (VERSION 3.7) PROJECT (createrepo_c C) include(GNUInstallDirs) @@ -39,13 +39,13 @@ find_package(OpenSSL REQUIRED) find_package(ZLIB REQUIRED) -pkg_check_modules(GLIB2 REQUIRED glib-2.0) -pkg_check_modules(GIO REQUIRED gio-2.0) -pkg_check_modules(GTHREAD2 REQUIRED gthread-2.0) -pkg_check_modules(LZMA REQUIRED liblzma) -pkg_check_modules(SQLITE3 REQUIRED sqlite3>=3.6.18) -pkg_check_modules(RPM REQUIRED rpm) -pkg_check_modules(ZSTD REQUIRED libzstd) +pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) +pkg_check_modules(GTHREAD2 REQUIRED IMPORTED_TARGET gthread-2.0) +pkg_check_modules(LZMA REQUIRED IMPORTED_TARGET liblzma) +pkg_check_modules(SQLITE3 REQUIRED IMPORTED_TARGET sqlite3>=3.6.18) +pkg_check_modules(RPM REQUIRED IMPORTED_TARGET rpm) +pkg_check_modules(ZSTD REQUIRED IMPORTED_TARGET libzstd) # Add include dirs @@ -73,7 +73,7 @@ # drpm OPTION (ENABLE_DRPM "Enable delta RPM support?" OFF) IF (ENABLE_DRPM) - pkg_check_modules(DRPM REQUIRED drpm>=0.4.0) + pkg_check_modules(DRPM REQUIRED IMPORTED_TARGET drpm>=0.4.0) include_directories (${DRPM_INCLUDE_DIRS}) ADD_DEFINITIONS("-DCR_DELTA_RPM_SUPPORT") ENDIF (ENABLE_DRPM) @@ -83,7 +83,7 @@ OPTION (WITH_ZCHUNK "Build with zchunk support" ON) IF (WITH_ZCHUNK) - pkg_check_modules(ZCK REQUIRED zck) + pkg_check_modules(ZCK REQUIRED IMPORTED_TARGET zck) include_directories(${ZCK_INCLUDE_DIRS}) SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWITH_ZCHUNK") SET (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DWITH_ZCHUNK") @@ -91,7 +91,7 @@ OPTION (WITH_LIBMODULEMD "Build with libmodulemd support" ON) IF (WITH_LIBMODULEMD) - pkg_check_modules(LIBMODULEMD REQUIRED modulemd-2.0) + pkg_check_modules(LIBMODULEMD REQUIRED IMPORTED_TARGET modulemd-2.0) include_directories(${LIBMODULEMD_INCLUDE_DIRS}) SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWITH_LIBMODULEMD") SET (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DWITH_LIBMODULEMD") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/createrepo_c-1.2.1/README.md new/createrepo_c-1.2.2/README.md --- old/createrepo_c-1.2.1/README.md 2025-03-17 08:14:47.000000000 +0100 +++ new/createrepo_c-1.2.2/README.md 2026-01-19 08:23:36.000000000 +0100 @@ -61,6 +61,12 @@ make clean && make ## Other build options +### ``-DBUILD_DOC_C=OFF`` + +Build C API documentation (Default: ON) + +Disable building of C API documentation, which requires doxygen to be present. + ### ``-DENABLE_LEGACY_WEAKDEPS=ON`` Enable legacy SUSE/Mageia/Mandriva weakdeps support (Default: ON) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/createrepo_c-1.2.1/VERSION.cmake new/createrepo_c-1.2.2/VERSION.cmake --- old/createrepo_c-1.2.1/VERSION.cmake 2025-03-17 08:14:47.000000000 +0100 +++ new/createrepo_c-1.2.2/VERSION.cmake 2026-01-19 08:23:36.000000000 +0100 @@ -1,3 +1,3 @@ SET(CR_MAJOR "1") SET(CR_MINOR "2") -SET(CR_PATCH "1") +SET(CR_PATCH "2") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/createrepo_c-1.2.1/createrepo_c.spec new/createrepo_c-1.2.2/createrepo_c.spec --- old/createrepo_c-1.2.1/createrepo_c.spec 2025-03-17 08:14:47.000000000 +0100 +++ new/createrepo_c-1.2.2/createrepo_c.spec 2026-01-19 08:23:36.000000000 +0100 @@ -4,6 +4,9 @@ %global bash_completion %{_datadir}/bash-completion/completions/* +# Generate API documentation from the sources +%bcond_without doc_c + # Fedora infrastructure needs it for producing Fedora ≤ 39 and EPEL ≤ 7 repositories # See https://github.com/rpm-software-management/createrepo_c/issues/398 %if ( 0%{?rhel} && ( 0%{?rhel} <= 7 || 0%{?rhel} >= 9 ) ) || ( 0%{?fedora} && 0%{?fedora} >= 45 ) @@ -35,7 +38,7 @@ %if %{defined gitrev} %define package_version %{?gitrev} %else -%define package_version 1.2.1 +%define package_version 1.2.2 %endif Summary: Creates a common metadata repository @@ -48,10 +51,12 @@ %global epoch_dep %{?epoch:%{epoch}:} -BuildRequires: cmake +BuildRequires: cmake >= 3.7.0 BuildRequires: gcc BuildRequires: bzip2-devel +%if %{with doc_c} BuildRequires: doxygen +%endif BuildRequires: glib2-devel >= 2.22.0 BuildRequires: libcurl-devel BuildRequires: libxml2-devel @@ -140,30 +145,35 @@ # Build createrepo_c with Pyhon 3 pushd build-py3 %cmake .. \ + -DBUILD_DOC_C=%{?with_doc_c:ON}%{!?with_doc_c:OFF} \ -DWITH_ZCHUNK=%{?with_zchunk:ON}%{!?with_zchunk:OFF} \ -DWITH_LIBMODULEMD=%{?with_libmodulemd:ON}%{!?with_libmodulemd:OFF} \ -DWITH_LEGACY_HASHES=%{?with_legacy_hashes:ON}%{!?with_legacy_hashes:OFF} \ -DENABLE_DRPM=%{?with_drpm:ON}%{!?with_drpm:OFF} \ -DWITH_SANITIZERS=%{?with_sanitizers:ON}%{!?with_sanitizers:OFF} - make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}" - # Build C documentation - make doc-c + %cmake_build + # Build documentation + %cmake_build -t doc popd %check # Run Python 3 tests pushd build-py3 # Compile C tests - make tests + %cmake_build -t tests # Run Python 3 tests - make ARGS="-V" test + %if 0%{?rhel} == 9 && %{defined ctest} + # Work around broken passing options to ctest macro, RHEL-120543 + %global ctest(-) %{expand:%{macrobody:ctest}} + %endif + %ctest -V popd %install pushd build-py3 # Install createrepo_c with Python 3 - make install DESTDIR=%{buildroot} + %cmake_install popd %if 0%{?fedora} || 0%{?rhel} > 7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/createrepo_c-1.2.1/doc/CMakeLists.txt new/createrepo_c-1.2.2/doc/CMakeLists.txt --- old/createrepo_c-1.2.1/doc/CMakeLists.txt 2025-03-17 08:14:47.000000000 +0100 +++ new/createrepo_c-1.2.2/doc/CMakeLists.txt 2026-01-19 08:23:36.000000000 +0100 @@ -1,18 +1,22 @@ ADD_SUBDIRECTORY (python) -find_package(Doxygen) -if(DOXYGEN_FOUND) +ADD_CUSTOM_TARGET (doc) +if (ENABLE_PYTHON) + ADD_DEPENDENCIES (doc doc-python) +endif (ENABLE_PYTHON) + +option(BUILD_DOC_C "Build C API documentation" ON) +if(BUILD_DOC_C) + find_package(Doxygen REQUIRED) CONFIGURE_FILE("Doxyfile.in.in" "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.in" @ONLY) add_custom_target(doc-c ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.in COMMENT "Building C API documentation with Doxygen" VERBATIM) -endif(DOXYGEN_FOUND) + ADD_DEPENDENCIES (doc doc-c) +endif(BUILD_DOC_C) IF(CREATEREPO_C_INSTALL_MANPAGES) INSTALL(FILES createrepo_c.8 mergerepo_c.8 modifyrepo_c.8 sqliterepo_c.8 DESTINATION "${CMAKE_INSTALL_MANDIR}/man8" COMPONENT bin) ENDIF(CREATEREPO_C_INSTALL_MANPAGES) - -ADD_CUSTOM_TARGET (doc) -ADD_DEPENDENCIES (doc doc-python doc-c) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/createrepo_c-1.2.1/setup.py new/createrepo_c-1.2.2/setup.py --- old/createrepo_c-1.2.1/setup.py 2025-03-17 08:14:47.000000000 +0100 +++ new/createrepo_c-1.2.2/setup.py 2026-01-19 08:23:36.000000000 +0100 @@ -40,6 +40,7 @@ }, cmake_args=[ '-DBIN_INSTALL_DIR:PATH=src/python/createrepo_c/data/bin', + '-DBUILD_DOC_C=OFF', '-DBUILD_LIBCREATEREPO_C_SHARED:BOOL=OFF', '-DCREATEREPO_C_INSTALL_DEVELOPMENT:BOOL=OFF', '-DCREATEREPO_C_INSTALL_MANPAGES:BOOL=OFF', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/createrepo_c-1.2.1/src/CMakeLists.txt new/createrepo_c-1.2.2/src/CMakeLists.txt --- old/createrepo_c-1.2.1/src/CMakeLists.txt 2025-03-17 08:14:47.000000000 +0100 +++ new/createrepo_c-1.2.2/src/CMakeLists.txt 2026-01-19 08:23:36.000000000 +0100 @@ -86,18 +86,24 @@ ADD_LIBRARY(libcreaterepo_c ${createrepo_c_library_type} ${createrepo_c_SRCS}) TARGET_LINK_LIBRARIES(libcreaterepo_c ${BZIP2_LIBRARIES}) TARGET_LINK_LIBRARIES(libcreaterepo_c ${CURL_LIBRARY}) -TARGET_LINK_LIBRARIES(libcreaterepo_c ${GLIB2_LIBRARIES}) -TARGET_LINK_LIBRARIES(libcreaterepo_c ${GIO_LIBRARIES}) -TARGET_LINK_LIBRARIES(libcreaterepo_c ${LIBMODULEMD_LIBRARIES}) +TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::GLIB2) +TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::GIO) +IF (WITH_LIBMODULEMD) + TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::LIBMODULEMD) +ENDIF (WITH_LIBMODULEMD) TARGET_LINK_LIBRARIES(libcreaterepo_c ${LIBXML2_LIBRARIES}) -TARGET_LINK_LIBRARIES(libcreaterepo_c ${LZMA_LIBRARIES}) +TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::LZMA) TARGET_LINK_LIBRARIES(libcreaterepo_c ${OPENSSL_LIBRARIES}) -TARGET_LINK_LIBRARIES(libcreaterepo_c ${RPM_LIBRARIES}) -TARGET_LINK_LIBRARIES(libcreaterepo_c ${SQLITE3_LIBRARIES}) +TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::RPM) +TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::SQLITE3) TARGET_LINK_LIBRARIES(libcreaterepo_c ${ZLIB_LIBRARY}) -TARGET_LINK_LIBRARIES(libcreaterepo_c ${ZCK_LIBRARIES}) -TARGET_LINK_LIBRARIES(libcreaterepo_c ${DRPM_LIBRARIES}) -TARGET_LINK_LIBRARIES(libcreaterepo_c ${ZSTD_LIBRARIES}) +IF (WITH_ZCHUNK) + TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::ZCK) +ENDIF (WITH_ZCHUNK) +IF (ENABLE_DRPM) + TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::DRPM) +ENDIF (ENABLE_DRPM) +TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::ZSTD) SET_TARGET_PROPERTIES(libcreaterepo_c PROPERTIES OUTPUT_NAME "createrepo_c" @@ -108,27 +114,29 @@ ADD_EXECUTABLE(createrepo_c createrepo_c.c cmd_parser.c) TARGET_LINK_LIBRARIES(createrepo_c libcreaterepo_c - ${GLIB2_LIBRARIES} - ${GTHREAD2_LIBRARIES}) + PkgConfig::GLIB2 + PkgConfig::GTHREAD2) ADD_EXECUTABLE(mergerepo_c mergerepo_c.c) TARGET_LINK_LIBRARIES(mergerepo_c libcreaterepo_c - ${GLIB2_LIBRARIES} - ${GTHREAD2_LIBRARIES} - ${LIBMODULEMD_LIBRARIES}) + PkgConfig::GLIB2 + PkgConfig::GTHREAD2) +IF (WITH_LIBMODULEMD) + TARGET_LINK_LIBRARIES(mergerepo_c PkgConfig::LIBMODULEMD) +ENDIF (WITH_LIBMODULEMD) ADD_EXECUTABLE(modifyrepo_c modifyrepo_c.c) TARGET_LINK_LIBRARIES(modifyrepo_c libcreaterepo_c - ${GLIB2_LIBRARIES} - ${GTHREAD2_LIBRARIES}) + PkgConfig::GLIB2 + PkgConfig::GTHREAD2) ADD_EXECUTABLE(sqliterepo_c sqliterepo_c.c) TARGET_LINK_LIBRARIES(sqliterepo_c libcreaterepo_c - ${GLIB2_LIBRARIES} - ${GTHREAD2_LIBRARIES}) + PkgConfig::GLIB2 + PkgConfig::GTHREAD2) CONFIGURE_FILE("createrepo_c.pc.cmake" "${CMAKE_SOURCE_DIR}/src/createrepo_c.pc" @ONLY) CONFIGURE_FILE("version.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/version.h" @ONLY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/createrepo_c-1.2.1/src/compression_wrapper.c new/createrepo_c-1.2.2/src/compression_wrapper.c --- old/createrepo_c-1.2.1/src/compression_wrapper.c 2025-03-17 08:14:47.000000000 +0100 +++ new/createrepo_c-1.2.2/src/compression_wrapper.c 2026-01-19 08:23:36.000000000 +0100 @@ -31,6 +31,7 @@ #include <lzma.h> #ifdef WITH_ZCHUNK #include <zck.h> +#include <unistd.h> #endif // WITH_ZCHUNK #include "error.h" #include "compression_wrapper.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/createrepo_c-1.2.1/src/createrepo_c.pc.cmake new/createrepo_c-1.2.2/src/createrepo_c.pc.cmake --- old/createrepo_c-1.2.1/src/createrepo_c.pc.cmake 2025-03-17 08:14:47.000000000 +0100 +++ new/createrepo_c-1.2.2/src/createrepo_c.pc.cmake 2026-01-19 08:23:36.000000000 +0100 @@ -8,5 +8,5 @@ Requires: glib-2.0 rpm libcurl sqlite3 Requires.private: zlib libxml-2.0 Libs: -L${libdir} -lcreaterepo_c -Libs.private: -lbz2 -lzma +Libs.private: -lbz2 -llzma Cflags: -I${includedir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/createrepo_c-1.2.1/src/parsehdr.c new/createrepo_c-1.2.2/src/parsehdr.c --- old/createrepo_c-1.2.1/src/parsehdr.c 2025-03-17 08:14:47.000000000 +0100 +++ new/createrepo_c-1.2.2/src/parsehdr.c 2026-01-19 08:23:36.000000000 +0100 @@ -666,7 +666,7 @@ if (hdrrflags & CR_HDRR_LOADHDRID) pkg->hdrid = cr_safe_string_chunk_insert(pkg->chunk, - headerGetString(hdr, RPMTAG_HDRID)); + headerGetString(hdr, RPMTAG_SHA1HEADER)); if (hdrrflags & CR_HDRR_LOADSIGNATURES) { rpmtd gpgtd = rpmtdNew(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/createrepo_c-1.2.1/tests/CMakeLists.txt new/createrepo_c-1.2.2/tests/CMakeLists.txt --- old/createrepo_c-1.2.1/tests/CMakeLists.txt 2025-03-17 08:14:47.000000000 +0100 +++ new/createrepo_c-1.2.2/tests/CMakeLists.txt 2026-01-19 08:23:36.000000000 +0100 @@ -1,61 +1,61 @@ ADD_EXECUTABLE(test_checksum test_checksum.c) -TARGET_LINK_LIBRARIES(test_checksum libcreaterepo_c ${GLIB2_LIBRARIES}) +TARGET_LINK_LIBRARIES(test_checksum libcreaterepo_c PkgConfig::GLIB2) ADD_DEPENDENCIES(tests test_checksum) ADD_EXECUTABLE(test_compression_wrapper test_compression_wrapper.c) -TARGET_LINK_LIBRARIES(test_compression_wrapper libcreaterepo_c ${GLIB2_LIBRARIES}) +TARGET_LINK_LIBRARIES(test_compression_wrapper libcreaterepo_c PkgConfig::GLIB2) ADD_DEPENDENCIES(tests test_compression_wrapper) ADD_EXECUTABLE(test_load_metadata test_load_metadata.c) -TARGET_LINK_LIBRARIES(test_load_metadata libcreaterepo_c ${GLIB2_LIBRARIES}) +TARGET_LINK_LIBRARIES(test_load_metadata libcreaterepo_c PkgConfig::GLIB2) ADD_DEPENDENCIES(tests test_load_metadata) ADD_EXECUTABLE(test_locate_metadata test_locate_metadata.c) -TARGET_LINK_LIBRARIES(test_locate_metadata libcreaterepo_c ${GLIB2_LIBRARIES}) +TARGET_LINK_LIBRARIES(test_locate_metadata libcreaterepo_c PkgConfig::GLIB2) ADD_DEPENDENCIES(tests test_locate_metadata) ADD_EXECUTABLE(test_misc test_misc.c) -TARGET_LINK_LIBRARIES(test_misc libcreaterepo_c ${GLIB2_LIBRARIES}) +TARGET_LINK_LIBRARIES(test_misc libcreaterepo_c PkgConfig::GLIB2) ADD_DEPENDENCIES(tests test_misc) ADD_EXECUTABLE(test_sqlite test_sqlite.c) -TARGET_LINK_LIBRARIES(test_sqlite libcreaterepo_c ${GLIB2_LIBRARIES}) +TARGET_LINK_LIBRARIES(test_sqlite libcreaterepo_c PkgConfig::GLIB2) ADD_DEPENDENCIES(tests test_sqlite) ADD_EXECUTABLE(test_xml_file test_xml_file.c) -TARGET_LINK_LIBRARIES(test_xml_file libcreaterepo_c ${GLIB2_LIBRARIES}) +TARGET_LINK_LIBRARIES(test_xml_file libcreaterepo_c PkgConfig::GLIB2) ADD_DEPENDENCIES(tests test_xml_file) ADD_EXECUTABLE(test_xml_parser_filelists test_xml_parser_filelists.c) -TARGET_LINK_LIBRARIES(test_xml_parser_filelists libcreaterepo_c ${GLIB2_LIBRARIES}) +TARGET_LINK_LIBRARIES(test_xml_parser_filelists libcreaterepo_c PkgConfig::GLIB2) ADD_DEPENDENCIES(tests test_xml_parser_filelists) ADD_EXECUTABLE(test_xml_parser_repomd test_xml_parser_repomd.c) -TARGET_LINK_LIBRARIES(test_xml_parser_repomd libcreaterepo_c ${GLIB2_LIBRARIES}) +TARGET_LINK_LIBRARIES(test_xml_parser_repomd libcreaterepo_c PkgConfig::GLIB2) ADD_DEPENDENCIES(tests test_xml_parser_repomd) ADD_EXECUTABLE(test_xml_parser_updateinfo test_xml_parser_updateinfo.c) -TARGET_LINK_LIBRARIES(test_xml_parser_updateinfo libcreaterepo_c ${GLIB2_LIBRARIES}) +TARGET_LINK_LIBRARIES(test_xml_parser_updateinfo libcreaterepo_c PkgConfig::GLIB2) ADD_DEPENDENCIES(tests test_xml_parser_updateinfo) ADD_EXECUTABLE(test_xml_parser_main_metadata_together test_xml_parser_main_metadata_together.c) -TARGET_LINK_LIBRARIES(test_xml_parser_main_metadata_together libcreaterepo_c ${GLIB2_LIBRARIES}) +TARGET_LINK_LIBRARIES(test_xml_parser_main_metadata_together libcreaterepo_c PkgConfig::GLIB2) ADD_DEPENDENCIES(tests test_xml_parser_main_metadata_together) ADD_EXECUTABLE(test_xml_dump test_xml_dump.c) -TARGET_LINK_LIBRARIES(test_xml_dump libcreaterepo_c ${GLIB2_LIBRARIES}) +TARGET_LINK_LIBRARIES(test_xml_dump libcreaterepo_c PkgConfig::GLIB2) ADD_DEPENDENCIES(tests test_xml_dump) ADD_EXECUTABLE(test_xml_dump_primary test_xml_dump_primary.c) -TARGET_LINK_LIBRARIES(test_xml_dump_primary libcreaterepo_c ${GLIB2_LIBRARIES}) +TARGET_LINK_LIBRARIES(test_xml_dump_primary libcreaterepo_c PkgConfig::GLIB2) ADD_DEPENDENCIES(tests test_xml_dump_primary) ADD_EXECUTABLE(test_koji test_koji.c) -TARGET_LINK_LIBRARIES(test_koji libcreaterepo_c ${GLIB2_LIBRARIES}) +TARGET_LINK_LIBRARIES(test_koji libcreaterepo_c PkgConfig::GLIB2) ADD_DEPENDENCIES(tests test_koji) ADD_EXECUTABLE(test_modifyrepo_shared test_modifyrepo_shared.c) -TARGET_LINK_LIBRARIES(test_modifyrepo_shared libcreaterepo_c ${GLIB2_LIBRARIES}) +TARGET_LINK_LIBRARIES(test_modifyrepo_shared libcreaterepo_c PkgConfig::GLIB2) ADD_DEPENDENCIES(tests test_modifyrepo_shared) CONFIGURE_FILE("run_tests.sh.in" "${CMAKE_BINARY_DIR}/tests/run_tests.sh")
