PR#11: Update to 3.0.23 (RHBZ#2257639) - rpms/gdcm

rpms / gdcm

#11 Update to 3.0.23 (RHBZ#2257639)

Merged 2 months ago by gui1ty. Opened 3 months ago by gui1ty.

rpms/ gui1ty/gdcm update into rawhide

Migrate to SPDX license

Sandro • 3 months ago

3d06352

Update to 3.0.23 (RHBZ#2257639)

Sandro • 3 months ago

ef7f455

.gitignore

file modified

		`@@ -30,3 +30,4 @@`
		`/gdcm-3.0.20.tar.gz`
		`/gdcm-3.0.21.tar.gz`
		`/gdcm-3.0.22.tar.gz`
		`+ /gdcm-3.0.23.tar.gz`

157.patch

file removed

-98

		`@@ -1,98 +0,0 @@`
		`- From 18042eba75e02270f844f19479caa650bc096174 Mon Sep 17 00:00:00 2001`
		`- From: Orion Poplawski <orion@nwra.com>`
		`- Date: Sun, 4 Jun 2023 16:33:23 -0600`
		`- Subject: [PATCH] Use charls cmake config, expect version >= 2.2.0`
		`-`
		`- ---`
		`- CMake/FindCharLS.cmake \| 40 ----------------------------------------`
		`- CMakeLists.txt \| 7 ++++---`
		`- Utilities/gdcm_charls.h \| 4 ++--`
		`- 3 files changed, 6 insertions(+), 45 deletions(-)`
		`- delete mode 100644 CMake/FindCharLS.cmake`
		`-`
		`- diff --git a/CMake/FindCharLS.cmake b/CMake/FindCharLS.cmake`
		`- deleted file mode 100644`
		`- index 8f6bf196f4..0000000000`
		`- --- a/CMake/FindCharLS.cmake`
		`- +++ /dev/null`
		`- @@ -1,40 +0,0 @@`
		`- -#`
		`- -# Copyright (c) 2006-2011 Mathieu Malaterre <mathieu.malaterre@gmail.com>`
		`- -#`
		`- -# Redistribution and use is allowed according to the terms of the New`
		`- -# BSD license.`
		`- -# For details see the accompanying COPYING-CMAKE-SCRIPTS file.`
		`- -#`
		`- -`
		`- -find_path(CHARLS_INCLUDE_DIR CharLS/charls.h`
		`- -/usr/local/include`
		`- -/usr/include`
		`- -)`
		`- -`
		`- -find_library(CHARLS_LIBRARY`
		`- - NAMES CharLS`
		`- - PATHS /usr/lib /usr/local/lib`
		`- - )`
		`- -`
		`- -if (CHARLS_LIBRARY AND CHARLS_INCLUDE_DIR)`
		`- - set(CHARLS_LIBRARIES ${CHARLS_LIBRARY})`
		`- - set(CHARLS_INCLUDE_DIRS ${CHARLS_INCLUDE_DIR})`
		`- - set(CHARLS_FOUND "YES")`
		`- -else ()`
		`- - set(CHARLS_FOUND "NO")`
		`- -endif ()`
		`- -`
		`- -if (CHARLS_FOUND)`
		`- - if (NOT CHARLS_FIND_QUIETLY)`
		`- - message(STATUS "Found CHARLS: ${CHARLS_LIBRARIES}")`
		`- - endif ()`
		`- -else ()`
		`- - if (CHARLS_FIND_REQUIRED)`
		`- - message(FATAL_ERROR "Could not find CHARLS library")`
		`- - endif ()`
		`- -endif ()`
		`- -`
		`- -mark_as_advanced(`
		`- - CHARLS_LIBRARY`
		`- - CHARLS_INCLUDE_DIR`
		`- - )`
		`- diff --git a/CMakeLists.txt b/CMakeLists.txt`
		`- index 41f5b4349f..e6f16484be 100644`
		`- --- a/CMakeLists.txt`
		`- +++ b/CMakeLists.txt`
		`- @@ -319,7 +319,7 @@ option(GDCM_USE_SYSTEM_PAPYRUS3 "Use system papyrus3" OFF)`
		`- option(GDCM_USE_SYSTEM_SOCKETXX "Use system socket++" OFF)`
		`- option(GDCM_USE_SYSTEM_LJPEG "Use system ljpeg (ijg lib)" OFF)`
		`- option(GDCM_USE_SYSTEM_OPENJPEG "Use system openjpeg" OFF)`
		`- -option(GDCM_USE_SYSTEM_CHARLS "Use system CharLS" OFF)`
		`- +option(GDCM_USE_SYSTEM_CHARLS "Use system charls" OFF)`
		`- mark_as_advanced(`
		`- GDCM_USE_SYSTEM_ZLIB`
		`- GDCM_USE_SYSTEM_OPENSSL`
		`- @@ -352,8 +352,9 @@ else()`
		`- endif()`
		`-`
		`- if(GDCM_USE_SYSTEM_CHARLS)`
		`- - find_package(CharLS 2.0.0 REQUIRED)`
		`- - set(GDCM_CHARLS_LIBRARIES ${CHARLS_LIBRARIES})`
		`- + find_package(charls 2.2.0 REQUIRED)`
		`- + set(GDCM_CHARLS_LIBRARIES charls)`
		`- + message(STATUS "Found charls version " ${charls_VERSION})`
		`- else()`
		`- set(GDCM_CHARLS_LIBRARIES gdcmcharls)`
		`- endif()`
		`- diff --git a/Utilities/gdcm_charls.h b/Utilities/gdcm_charls.h`
		`- index b80451c490..d2b8d6a78e 100644`
		`- --- a/Utilities/gdcm_charls.h`
		`- +++ b/Utilities/gdcm_charls.h`
		`- @@ -17,8 +17,8 @@`
		`- /* Use the charls library configured for gdcm. */`
		`- #include "gdcmTypes.h"`
		`- #ifdef GDCM_USE_SYSTEM_CHARLS`
		`- -// It is expected that version 2.0.0 is used`
		`- -# include <CharLS/charls.h>`
		`- +// It is expected that version >= 2.2.0 is used`
		`- +# include <charls/charls.h>`
		`- #else`
		`- #include "gdcmcharls/charls.h"`
		`- #endif`

gdcm.spec

file modified

+13 -14

		`@@ -9,10 +9,11 @@`
		`%bcond_with texdocs`

		`Name: gdcm`
		`- Version: 3.0.22`
		`+ Version: 3.0.23`
		`Release: %autorelease`
		`Summary: Grassroots DiCoM is a C++ library to parse DICOM medical files`
		`- License: BSD`
		`+ # SPDX`
		`+ License: BSD-3-Clause`
		`URL: http://gdcm.sourceforge.net/wiki/index.php/Main_Page`
		`# Use github release`
		`Source0: https://github.com/malaterre/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz`
		`@@ -21,8 +22,6 @@`
		`Patch1: 0001-3.0.1-Use-copyright.patch`
		`# Fix for 1687233`
		`Patch2: 0002-Fix-export-variables.patch`
		`- # Support charls > 2.0 - https://github.com/malaterre/GDCM/pull/157`
		`- Patch3: https://patch-diff.githubusercontent.com/raw/malaterre/GDCM/pull/157.patch`

		`BuildRequires: CharLS-devel >= 2.2`
		`BuildRequires: cmake`
		`@@ -192,25 +191,25 @@`
		`%doc AUTHORS README.md`
		`%license Copyright.txt README.Copyright.txt`
		`%{_libdir}/libgdcmCommon.so.3.0`
		`- %{_libdir}/libgdcmCommon.so.3.0.22`
		`+ %{_libdir}/libgdcmCommon.so.3.0.23`
		`%{_libdir}/libgdcmDICT.so.3.0`
		`- %{_libdir}/libgdcmDICT.so.3.0.22`
		`+ %{_libdir}/libgdcmDICT.so.3.0.23`
		`%{_libdir}/libgdcmDSED.so.3.0`
		`- %{_libdir}/libgdcmDSED.so.3.0.22`
		`+ %{_libdir}/libgdcmDSED.so.3.0.23`
		`%{_libdir}/libgdcmIOD.so.3.0`
		`- %{_libdir}/libgdcmIOD.so.3.0.22`
		`+ %{_libdir}/libgdcmIOD.so.3.0.23`
		`%{_libdir}/libgdcmMEXD.so.3.0`
		`- %{_libdir}/libgdcmMEXD.so.3.0.22`
		`+ %{_libdir}/libgdcmMEXD.so.3.0.23`
		`%{_libdir}/libgdcmMSFF.so.3.0`
		`- %{_libdir}/libgdcmMSFF.so.3.0.22`
		`+ %{_libdir}/libgdcmMSFF.so.3.0.23`
		`%{_libdir}/libgdcmjpeg12.so.3.0`
		`- %{_libdir}/libgdcmjpeg12.so.3.0.22`
		`+ %{_libdir}/libgdcmjpeg12.so.3.0.23`
		`%{_libdir}/libgdcmjpeg16.so.3.0`
		`- %{_libdir}/libgdcmjpeg16.so.3.0.22`
		`+ %{_libdir}/libgdcmjpeg16.so.3.0.23`
		`%{_libdir}/libgdcmjpeg8.so.3.0`
		`- %{_libdir}/libgdcmjpeg8.so.3.0.22`
		`+ %{_libdir}/libgdcmjpeg8.so.3.0.23`
		`%{_libdir}/libgdcmmd5.so.3.0`
		`- %{_libdir}/libgdcmmd5.so.3.0.22`
		`+ %{_libdir}/libgdcmmd5.so.3.0.23`
		`%{_libdir}/libsocketxx.so.1.2`
		`%{_libdir}/libsocketxx.so.1.2.0`
		`%{_datadir}/%{name}-3.0/XML/`

sources

file modified

+1 -1

		`@@ -1,2 +1,2 @@`
		`- SHA512 (gdcm-3.0.22.tar.gz) = f4fd81db731b60eebd7d67b8a7f2aa67f44d788f4c0a3f2cef9490fd4f0f1ae9caea1a9a8727619edab6aeda815ae6ace5266b1428b9bea81b7c984deb78bbac`
		`+ SHA512 (gdcm-3.0.23.tar.gz) = a1c45434e925ddac293993014686865aecf1b6745013ed6a141b6ee1bdbe7ddef6abcfc2491583e63f33f4292617ee65412da4c41f38731409df9149903a8772`
		`SHA512 (gdcmData.tar.gz) = ddc67a7a0b41b2d6e1e03defb6fb8a06ceeb2e9dd9bb47dfa4f7283d79df7c1e52577b799c00e930719ae6cdda46bded9497a67b8241359f238f5366085ec9ee`

gui1ty commented 3 months ago

Migrate to SPDX license

Going by the specfile comment, ABI doesn't break, but soname is bumped. So, I guess, this needs announcement on devel ML.

zuul commented 3 months ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/fcdd44cf543d43bbb750edd2f83386ca

check-for-arches : SUCCESS in 2m 29s
check-for-eln : SUCCESS in 17s
eln-rpm-scratch-build : FAILURE in 4m 00s
rpm-scratch-build : FAILURE in 3m 55s
rpm-scratch-build-s390x : FAILURE in 3m 06s (non-voting)
rpm-scratch-build-ppc64le : FAILURE in 3m 47s (non-voting)
rpm-scratch-build-i686 : FAILURE in 3m 16s (non-voting)
rpm-scratch-build-aarch64 : FAILURE in 2m 50s (non-voting)
rpm-linter : SKIPPED Skipped due to failed job rpm-scratch-build (non-voting)
rpm-rpminspect : SKIPPED Skipped due to failed job rpm-scratch-build (non-voting)
check-for-sti-tests : SKIPPED Skipped due to failed job rpm-scratch-build
check-for-fmf-tests : SKIPPED Skipped due to failed job rpm-scratch-build
rpm-install-test : SKIPPED Skipped due to failed job rpm-scratch-build
rpm-tmt-test : SKIPPED Skipped due to failed job rpm-scratch-build
rpm-sti-test : SKIPPED Skipped due to failed job rpm-scratch-build

rebased onto ef7f455

3 months ago

gui1ty commented 3 months ago

I accidentally removed gdcmData.tar.gz from sources. The file itself remains unchanged.

zuul commented 3 months ago

check-for-arches : SUCCESS in 1m 38s
check-for-eln : SUCCESS in 17s
eln-rpm-scratch-build : FAILURE in 3m 39s
rpm-scratch-build : FAILURE in 3m 02s
rpm-scratch-build-s390x : FAILURE in 3m 17s (non-voting)
rpm-scratch-build-ppc64le : FAILURE in 2m 34s (non-voting)
rpm-scratch-build-i686 : FAILURE in 3m 46s (non-voting)
rpm-scratch-build-aarch64 : FAILURE in 3m 04s (non-voting)
rpm-linter : SKIPPED Skipped due to failed job rpm-scratch-build (non-voting)
rpm-rpminspect : SKIPPED Skipped due to failed job rpm-scratch-build (non-voting)
check-for-sti-tests : SKIPPED Skipped due to failed job rpm-scratch-build
check-for-fmf-tests : SKIPPED Skipped due to failed job rpm-scratch-build
rpm-install-test : SKIPPED Skipped due to failed job rpm-scratch-build
rpm-tmt-test : SKIPPED Skipped due to failed job rpm-scratch-build
rpm-sti-test : SKIPPED Skipped due to failed job rpm-scratch-build

gui1ty commented 3 months ago

recheck

gui1ty commented 3 months ago

[citest]

zuul commented 3 months ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/d0ab36c1ae844abb85ab66d5ddc66bdd

check-for-arches : SUCCESS in 2m 34s
check-for-eln : SUCCESS in 16s
eln-rpm-scratch-build : SUCCESS in 20m 40s
rpm-scratch-build : SUCCESS in 27m 10s
rpm-scratch-build-s390x : SUCCESS in 20m 15s (non-voting)
rpm-scratch-build-ppc64le : SUCCESS in 22m 33s (non-voting)
rpm-scratch-build-i686 : SUCCESS in 21m 35s (non-voting)
rpm-scratch-build-aarch64 : SUCCESS in 19m 31s (non-voting)
rpm-linter : FAILURE in 9m 15s (non-voting)
rpm-rpminspect : FAILURE in 7m 10s (non-voting)
check-for-sti-tests : SUCCESS in 15s
check-for-fmf-tests : SUCCESS in 15s
rpm-install-test : SUCCESS in 1m 25s
Skipped 2 jobs

gui1ty commented 2 months ago

abipkgdiff tells me it found three added functions:

abipkgdiff --d1 results_gdcm/3.0.22/7.fc41/gdcm-debuginfo-3.0.22-7.fc41.x86_64.rpm --devel1 results_gdcm/3.0.22/7.fc41/gdcm-devel-3.0.22-7.fc41.x86_64.rpm --d2 results_gdcm/3.0.23/1.fc41/gdcm-debuginfo-3.0.23-1.fc41.x86_64.rpm --devel2 results_gdcm/3.0.23/1.fc41/gdcm-devel-3.0.23-1.fc41.x86_64.rpm results_gdcm/3.0.22/7.fc41/gdcm-3.0.22-7.fc41.x86_64.rpm results_gdcm/3.0.23/1.fc41/gdcm-3.0.23-1.fc41.x86_64.rpm 
================ changes of 'libgdcmMSFF.so.3.0.22'===============
  Functions changes summary: 0 Removed, 0 Changed (23 filtered out), 3 Added functions
  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable

  3 Added functions:

    [A] 'method void gdcm::Cleaner::EmptyWhenScrubFails(bool)'    {_ZN4gdcm7Cleaner19EmptyWhenScrubFailsEb}
    [A] 'method bool gdcm::Cleaner::impl::CleanCSAImage(gdcm::DataSet&, const gdcm::DataElement&)'    {_ZN4gdcm7Cleaner4impl13CleanCSAImageERNS_7DataSetERKNS_11DataElementE}
    [A] 'method bool gdcm::Cleaner::impl::CleanCSASeries(gdcm::DataSet&, const gdcm::DataElement&)'    {_ZN4gdcm7Cleaner4impl14CleanCSASeriesERNS_7DataSetERKNS_11DataElementE}

================ end of changes of 'libgdcmMSFF.so.3.0.22'===============

The dependent packages all depend on libgdcmFOOO.so.3.0() and that has not been bumped by this update. I guess that means we can skip the ML announcement and push the update as is?

ankursinha commented 2 months ago

Yeh, there shouldn't be a rebuild required here. gdcm does not bump sonames for patch releases. So, good to go :+1:

gui1ty commented 2 months ago

Well, they do. The libraries are all ending in 3.0.23 now. But they promise ABI stability according to the comment in the spec file and abipkgdiff confirms they've kept that promise. Merging ...

Pull-Request has been merged by gui1ty

2 months ago