commit 3c238d443d0d0dd235994000011de4bc2aa1c42a
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Wed Apr 24 20:26:20 2024 +0200
- updated to 3.6.8 (new sonames)
dcmtk-etc.patch | 20 +++++++-------
dcmtk-pc.patch | 31 +++++++++++++++------
dcmtk.spec | 86 ++++++++++++++++++++++++++++++++-------------------------
3 files changed, 81 insertions(+), 56 deletions(-)
---
diff --git a/dcmtk.spec b/dcmtk.spec
index 0ea009b..4980d88 100644
--- a/dcmtk.spec
+++ b/dcmtk.spec
@@ -4,19 +4,19 @@
# libjpeg 8 already included arithmetic encoding support, but not lossless)
#
# Conditional build:
-%bcond_without icu # use glibc iconv() instead of icu for charset
conversion
+%bcond_without icu # libicu instead of bundled oficonv
# glibc iconv supports only AbortTranscodingOnIllegalSequence conversion flag
# icu supports AbortTranscodingOnIllegalSequence and DiscardIllegalSequences
# standalone libiconv >= 1.8 supports additionally
TransliterateIllegalSequences
Summary: DICOM Toolkit - implementation of DICOM/MEDICOM standard
Summary(pl.UTF-8): Narzędzia DICOM - implementacja standardu DICOM/MEDICOM
Name: dcmtk
-Version: 3.6.7
-Release: 2
+Version: 3.6.8
+Release: 1
License: BSD
Group: Libraries
-Source0:
https://nero.offis.de/download/dcmtk/release/%{name}-%{version}.tar.gz
-# Source0-md5: e4d519bb315ec3944f3f1d61df465cbd
+Source0:
https://dicom.offis.de/download/dcmtk/release/%{name}-%{version}.tar.gz
+# Source0-md5: 7522e06ca2479183eb535c5da2bdf5e4
Patch0: %{name}-3.6.0-0005-Fixed-includes-for-CharLS-1.0.patch
Patch1:
%{name}-3.6.1-0001-Removed-reference-to-bundled-libcharls.patch
Patch2: %{name}-3.6.1-0002-Find-and-include-CharLS.patch
@@ -72,6 +72,7 @@ Summary(pl.UTF-8): Pliki nagłówkowe bibliotek DCMTK
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
%{?with_icu:Requires: libicu-devel}
+Requires: libpng-devel >= 2:1.2.8
Requires: libstdc++-devel >= 6:4.8.1
Requires: libtiff-devel >= 4
Requires: libwrap-devel
@@ -105,6 +106,7 @@ cd build
# SNDFILE does nothing (as of 3.6.7), just -devel dependency
%cmake .. \
-DCMAKE_INSTALL_LIBDIR=%{_lib} \
+ %{?with_icu:-DDCMTK_ENABLE_CHARSET_CONVERSION=ICU} \
-DDCMTK_INSTALL_CMKDIR=%{_lib}/cmake/dcmtk \
-DBUILD_APPS:BOOL=ON \
-DBUILD_SHARED_LIBS:BOOL=ON \
@@ -112,7 +114,7 @@ cd build
-DDCMTK_USE_CXX11_STL:BOOL=ON \
-DDCMTK_WITH_CHARLS:BOOL=ON \
-DDCMTK_WITH_ICONV:BOOL=OFF \
- %{!?with_icu:-DDCMTK_WITH_ICU:BOOL=OFF} \
+ %{?with_icu:-DDCMTK_WITH_ICU:BOOL=ON} \
-DDCMTK_WITH_OPENSSL:BOOL=ON \
-DDCMTK_WITH_PNG:BOOL=ON \
-DDCMTK_WITH_PRIVATE_TAGS:BOOL=ON \
@@ -132,8 +134,10 @@ rm -rf $RPM_BUILD_ROOT
# disable completeness check incompatible with split packaging
%{__sed} -i -e '/^foreach(target .*IMPORT_CHECK_TARGETS/,/^endforeach/d;
/^unset(_IMPORT_CHECK_TARGETS)/d'
$RPM_BUILD_ROOT%{_libdir}/cmake/dcmtk/DCMTKTargets.cmake
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/{oficonv,ofstd}_tests
+
# packaged as %doc
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/doc-%{version}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -144,8 +148,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc ANNOUNCE CHANGES COPYRIGHT FAQ HISTORY README
-%doc dcmdata/docs/datadict.txt dcmnet/docs/asconfig.txt
-%doc dcmqrdb/docs/dcmqr*.txt dcmtls/docs/ciphers.txt
+%doc dcmdata/docs/datadict.txt dcmnet/docs/asconfig.txt
dcmqrdb/docs/dcmqr*.txt dcmtls/docs/ciphers.txt
%attr(755,root,root) %{_bindir}/cda2dcm
%attr(755,root,root) %{_bindir}/dcm*
%attr(755,root,root) %{_bindir}/dcod2lum
@@ -160,10 +163,11 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/findscu
%attr(755,root,root) %{_bindir}/getscu
%attr(755,root,root) %{_bindir}/img2dcm
+%attr(755,root,root) %{_bindir}/mkcsmapper
+%attr(755,root,root) %{_bindir}/mkesdb
%attr(755,root,root) %{_bindir}/mkreport
%attr(755,root,root) %{_bindir}/movescu
%attr(755,root,root) %{_bindir}/msgserv
-%attr(755,root,root) %{_bindir}/ofstd_tests
%attr(755,root,root) %{_bindir}/pdf2dcm
%attr(755,root,root) %{_bindir}/stl2dcm
%attr(755,root,root) %{_bindir}/storescp
@@ -181,7 +185,7 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/dcmtk/printers.cfg
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/dcmtk/storescp.cfg
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/dcmtk/storescu.cfg
-%{_datadir}/dcmtk
+%{_datadir}/dcmtk-%{version}
%{_mandir}/man1/cda2dcm.1*
%{_mandir}/man1/dcm*.1*
%{_mandir}/man1/dcod2lum.1*
@@ -195,6 +199,8 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/findscu.1*
%{_mandir}/man1/getscu.1*
%{_mandir}/man1/img2dcm.1*
+%{_mandir}/man1/mkcsmapper.1*
+%{_mandir}/man1/mkesdb.1*
%{_mandir}/man1/movescu.1*
%{_mandir}/man1/pdf2dcm.1*
%{_mandir}/man1/stl2dcm.1*
@@ -208,57 +214,61 @@ rm -rf $RPM_BUILD_ROOT
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libcmr.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcmr.so.17
+%attr(755,root,root) %ghost %{_libdir}/libcmr.so.18
%attr(755,root,root) %{_libdir}/libdcmdata.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmdata.so.17
+%attr(755,root,root) %ghost %{_libdir}/libdcmdata.so.18
%attr(755,root,root) %{_libdir}/libdcmect.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmect.so.17
+%attr(755,root,root) %ghost %{_libdir}/libdcmect.so.18
%attr(755,root,root) %{_libdir}/libdcmdsig.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmdsig.so.17
+%attr(755,root,root) %ghost %{_libdir}/libdcmdsig.so.18
%attr(755,root,root) %{_libdir}/libdcmfg.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmfg.so.17
+%attr(755,root,root) %ghost %{_libdir}/libdcmfg.so.18
%attr(755,root,root) %{_libdir}/libdcmimage.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmimage.so.17
+%attr(755,root,root) %ghost %{_libdir}/libdcmimage.so.18
%attr(755,root,root) %{_libdir}/libdcmimgle.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmimgle.so.17
+%attr(755,root,root) %ghost %{_libdir}/libdcmimgle.so.18
%attr(755,root,root) %{_libdir}/libdcmiod.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmiod.so.17
+%attr(755,root,root) %ghost %{_libdir}/libdcmiod.so.18
%attr(755,root,root) %{_libdir}/libdcmjpeg.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmjpeg.so.17
+%attr(755,root,root) %ghost %{_libdir}/libdcmjpeg.so.18
%attr(755,root,root) %{_libdir}/libdcmjpls.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmjpls.so.17
+%attr(755,root,root) %ghost %{_libdir}/libdcmjpls.so.18
%attr(755,root,root) %{_libdir}/libdcmnet.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmnet.so.17
+%attr(755,root,root) %ghost %{_libdir}/libdcmnet.so.18
%attr(755,root,root) %{_libdir}/libdcmpstat.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmpstat.so.17
+%attr(755,root,root) %ghost %{_libdir}/libdcmpstat.so.18
%attr(755,root,root) %{_libdir}/libdcmqrdb.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmqrdb.so.17
+%attr(755,root,root) %ghost %{_libdir}/libdcmqrdb.so.18
%attr(755,root,root) %{_libdir}/libdcmrt.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmrt.so.17
+%attr(755,root,root) %ghost %{_libdir}/libdcmrt.so.18
%attr(755,root,root) %{_libdir}/libdcmseg.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmseg.so.17
+%attr(755,root,root) %ghost %{_libdir}/libdcmseg.so.18
%attr(755,root,root) %{_libdir}/libdcmpmap.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmpmap.so.17
+%attr(755,root,root) %ghost %{_libdir}/libdcmpmap.so.18
%attr(755,root,root) %{_libdir}/libdcmsr.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmsr.so.17
+%attr(755,root,root) %ghost %{_libdir}/libdcmsr.so.18
%attr(755,root,root) %{_libdir}/libdcmtract.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmtract.so.17
+%attr(755,root,root) %ghost %{_libdir}/libdcmtract.so.18
%attr(755,root,root) %{_libdir}/libdcmtls.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmtls.so.17
+%attr(755,root,root) %ghost %{_libdir}/libdcmtls.so.18
%attr(755,root,root) %{_libdir}/libdcmwlm.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmwlm.so.17
+%attr(755,root,root) %ghost %{_libdir}/libdcmwlm.so.18
+%attr(755,root,root) %{_libdir}/libdcmxml.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdcmxml.so.18
%attr(755,root,root) %{_libdir}/libi2d.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libi2d.so.17
+%attr(755,root,root) %ghost %{_libdir}/libi2d.so.18
%attr(755,root,root) %{_libdir}/libijg12.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libijg12.so.17
+%attr(755,root,root) %ghost %{_libdir}/libijg12.so.18
%attr(755,root,root) %{_libdir}/libijg16.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libijg16.so.17
+%attr(755,root,root) %ghost %{_libdir}/libijg16.so.18
%attr(755,root,root) %{_libdir}/libijg8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libijg8.so.17
+%attr(755,root,root) %ghost %{_libdir}/libijg8.so.18
+%attr(755,root,root) %{_libdir}/liboficonv.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liboficonv.so.18
%attr(755,root,root) %{_libdir}/liboflog.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liboflog.so.17
+%attr(755,root,root) %ghost %{_libdir}/liboflog.so.18
%attr(755,root,root) %{_libdir}/libofstd.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libofstd.so.17
+%attr(755,root,root) %ghost %{_libdir}/libofstd.so.18
%files devel
%defattr(644,root,root,755)
@@ -282,10 +292,12 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libdcmtls.so
%attr(755,root,root) %{_libdir}/libdcmtract.so
%attr(755,root,root) %{_libdir}/libdcmwlm.so
+%attr(755,root,root) %{_libdir}/libdcmxml.so
%attr(755,root,root) %{_libdir}/libi2d.so
%attr(755,root,root) %{_libdir}/libijg12.so
%attr(755,root,root) %{_libdir}/libijg16.so
%attr(755,root,root) %{_libdir}/libijg8.so
+%attr(755,root,root) %{_libdir}/liboficonv.so
%attr(755,root,root) %{_libdir}/liboflog.so
%attr(755,root,root) %{_libdir}/libofstd.so
%{_libdir}/cmake/dcmtk
diff --git a/dcmtk-etc.patch b/dcmtk-etc.patch
index 06b8028..20235f6 100644
--- a/dcmtk-etc.patch
+++ b/dcmtk-etc.patch
@@ -1,11 +1,11 @@
---- dcmtk-3.6.5/CMake/GenerateDCMTKConfigure.cmake.orig 2019-12-17
21:15:50.393593359 +0100
-+++ dcmtk-3.6.5/CMake/GenerateDCMTKConfigure.cmake 2019-12-17
21:17:34.619695384 +0100
-@@ -164,7 +164,7 @@
- set(DCM_DICT_DEFAULT_PATH "")
- endif()
- # Set default directory for configuration and support data.
-- set(DCMTK_DEFAULT_CONFIGURATION_DIR
"${DCMTK_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/dcmtk/")
-+ set(DCMTK_DEFAULT_CONFIGURATION_DIR
"${CMAKE_INSTALL_FULL_SYSCONFDIR}/dcmtk/")
- set(DCMTK_DEFAULT_SUPPORT_DATA_DIR
"${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dcmtk/")
- endif()
+--- dcmtk-3.6.8/CMake/GenerateDCMTKConfigure.cmake.orig 2023-12-19
11:12:57.000000000 +0100
++++ dcmtk-3.6.8/CMake/GenerateDCMTKConfigure.cmake 2024-04-24
19:35:36.709413667 +0200
+@@ -202,7 +202,7 @@ else()
+
+ # Modify the installation paths for configuration files, data files and
documents
+ # by adding a subdirectory with the DCMTK name and version number
+- set(CMAKE_INSTALL_FULL_SYSCONFDIR
"${CMAKE_INSTALL_FULL_SYSCONFDIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}")
++ set(CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/dcmtk")
+ set(CMAKE_INSTALL_FULL_DATADIR
"${CMAKE_INSTALL_FULL_DATADIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}")
+ set(CMAKE_INSTALL_FULL_DOCDIR
"${CMAKE_INSTALL_FULL_DOCDIR}-${DCMTK_COMPLETE_PACKAGE_VERSION}")
diff --git a/dcmtk-pc.patch b/dcmtk-pc.patch
index 609662c..54eb099 100644
--- a/dcmtk-pc.patch
+++ b/dcmtk-pc.patch
@@ -1,11 +1,24 @@
---- dcmtk-3.6.7/CMake/dcmtk.pc.in.orig 2022-04-28 15:47:25.000000000 +0200
-+++ dcmtk-3.6.7/CMake/dcmtk.pc.in 2023-04-26 06:15:57.547750811 +0200
+--- dcmtk-3.6.8/CMake/dcmtk.pc.in.orig 2024-04-24 18:54:10.376541770 +0200
++++ dcmtk-3.6.8/CMake/dcmtk.pc.in 2024-04-24 18:58:01.498232007 +0200
@@ -1,7 +1,7 @@
- prefix="@CMAKE_INSTALL_PREFIX@"
- exec_prefix="${prefix}"
- libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@"
-- includedir="${prefix}/include/"
-+ includedir="${prefix}/include"
+-prefix="@CMAKE_INSTALL_PREFIX@"
+-exec_prefix="${prefix}"
+-libdir="@CMAKE_INSTALL_FULL_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)
+ Name: DCMTK
+ Description: DICOM Toolkit (DCMTK)
+@@ -9,6 +9,6 @@ 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@
++Cflags: -I${includedir}
++Libs: -L${libdir} @PKGCONF_LIBS@
++Libs.private: -L${libdir} @PKGCONF_LIBS_PRIV@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dcmtk.git/commitdiff/3c238d443d0d0dd235994000011de4bc2aa1c42a
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
