Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dcmtk for openSUSE:Factory checked in at 2023-12-15 21:49:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dcmtk (Old) and /work/SRC/openSUSE:Factory/.dcmtk.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dcmtk" Fri Dec 15 21:49:49 2023 rev:26 rq:1133354 version:3.6.7 Changes: -------- --- /work/SRC/openSUSE:Factory/dcmtk/dcmtk.changes 2023-05-12 20:40:10.742820904 +0200 +++ /work/SRC/openSUSE:Factory/.dcmtk.new.25432/dcmtk.changes 2023-12-15 21:50:10.440528771 +0100 @@ -1,0 +2,6 @@ +Thu Dec 14 14:19:39 UTC 2023 - Dominique Leuenberger <[email protected]> + +- Add dcmtk-fix-pkgconfig.patch: Removed leading spaces in + dcmtk.pc.in. This in turn makes the .pc file actually valid. + +------------------------------------------------------------------- New: ---- dcmtk-fix-pkgconfig.patch BETA DEBUG BEGIN: New: - Add dcmtk-fix-pkgconfig.patch: Removed leading spaces in dcmtk.pc.in. This in turn makes the .pc file actually valid. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dcmtk.spec ++++++ --- /var/tmp/diff_new_pack.SLmBaU/_old 2023-12-15 21:50:10.996549229 +0100 +++ /var/tmp/diff_new_pack.SLmBaU/_new 2023-12-15 21:50:11.000549376 +0100 @@ -1,7 +1,7 @@ # # spec file for package dcmtk # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Version: 3.6.7 Release: 0 Summary: DICOM Toolkit -License: BSD-3-Clause AND Apache-2.0 +License: Apache-2.0 AND BSD-3-Clause Group: Productivity/Scientific/Other URL: https://dicom.offis.de/dcmtk.php.en Source0: ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/release/%{name}-%{version}.tar.gz @@ -29,6 +29,9 @@ Patch0: dcmtk-fix-DCMTKTargets.cmake.patch # PATCH-FIX-UPSTREAM -- CVE-2022-43272 Patch1: dcmtk-CVE-2022-43272.patch +# https://git.dcmtk.org/?p=dcmtk.git;a=commit;h=331c4d9011a19623aee3d82f2c4d35e903528e03 +# PATCH-FIX-UPSTREAM dcmtk-fix-pkgconfig.patch -- Removed leading spaces in dcmtk.pc.in. +Patch2: dcmtk-fix-pkgconfig.patch BuildRequires: cmake BuildRequires: doxygen BuildRequires: fdupes ++++++ dcmtk-fix-pkgconfig.patch ++++++ >From 04b0d6ceef291c22503932348835469bee0ea0a8 Mon Sep 17 00:00:00 2001 From: Michael Onken <[email protected]> Date: Wed, 25 Jan 2023 10:42:51 +0100 Subject: [PATCH] Fix builds with absolute CMAKE_INSTALL_LIBDIR. Thanks to GitHub user StillerHarpo (Florian Engel) for the report and suggested patch. --- CMake/dcmtk.pc.in | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: dcmtk-3.6.7/CMake/dcmtk.pc.in =================================================================== --- dcmtk-3.6.7.orig/CMake/dcmtk.pc.in +++ dcmtk-3.6.7/CMake/dcmtk.pc.in @@ -1,14 +1,14 @@ - prefix="@CMAKE_INSTALL_PREFIX@" - exec_prefix="${prefix}" - libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@" - includedir="${prefix}/include/" +prefix="@CMAKE_INSTALL_PREFIX@" +exec_prefix="${prefix}" +libdir="@CMAKE_INSTALL_FULL_LIBDIR@" +includedir="${prefix}/include/" - Name: DCMTK - Description: DICOM Toolkit (DCMTK) - URL: https://dcmtk.org - Version: @DCMTK_MAJOR_VERSION@.@DCMTK_MINOR_VERSION@.@DCMTK_BUILD_VERSION@ - Requires: @PKGCONF_REQ_PUB@ - Requires.private: @PKGCONF_REQ_PRIV@ - Cflags: -I"${includedir}" - Libs: -L"${libdir}" @PKGCONF_LIBS@ - Libs.private: -L"${libdir}" @PKGCONF_LIBS_PRIV@ +Name: DCMTK +Description: DICOM Toolkit (DCMTK) +URL: https://dcmtk.org +Version: @DCMTK_MAJOR_VERSION@.@DCMTK_MINOR_VERSION@.@DCMTK_BUILD_VERSION@ +Requires: @PKGCONF_REQ_PUB@ +Requires.private: @PKGCONF_REQ_PRIV@ +Cflags: -I"${includedir}" +Libs: -L"${libdir}" @PKGCONF_LIBS@ +Libs.private: -L"${libdir}" @PKGCONF_LIBS_PRIV@ Index: dcmtk-3.6.7/CMakeLists.txt =================================================================== --- dcmtk-3.6.7.orig/CMakeLists.txt +++ dcmtk-3.6.7/CMakeLists.txt @@ -208,5 +208,5 @@ configure_file( ) install(FILES "${DCMTK_BINARY_DIR}/dcmtk.pc" - DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
