- updated to 3.6.6

- updated Find-and-include-CharLS,Use-cmake-suggested-location-for-CharLS patches

diff --git a/dcmtk-3.6.1-0002-Find-and-include-CharLS.patch b/dcmtk-3.6.1-0002-Find-and-include-CharLS.patch
index f43287466741e5d5cf00e4a083a911b4b3719132..407c9980b1f47269f92ce5c553460c123dee1fca 100644 (file)
--- a/dcmtk-3.6.1-0002-Find-and-include-CharLS.patch
+++ b/dcmtk-3.6.1-0002-Find-and-include-CharLS.patch
@@ -7,28 +7,26 @@ Subject: [PATCH] Find and include CharLS
  CMake/3rdparty.cmake | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
-diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake
-index 9fcca77..2ccda35 100755
---- a/CMake/3rdparty.cmake
-+++ b/CMake/3rdparty.cmake
-@@ -357,6 +357,20 @@
-     endif()
+--- dcmtk-3.6.6/CMake/3rdparty.cmake.orig      2021-08-28 21:45:58.647654623 +0200
++++ dcmtk-3.6.6/CMake/3rdparty.cmake   2021-08-28 22:05:55.184505760 +0200
+@@ -411,6 +411,20 @@ if(DCMTK_WITH_DOXYGEN)
    endif()
+ endif()
  
-+  set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake)
-+  
-+  if(DCMTK_WITH_CHARLS)
-+    find_package(CharLS)
-+    include_directories(${CHARLS_INCLUDE_DIRS})
-+    set(CHARLS_LIBS ${CHARLS_LIBRARIES})
-+    if (NOT CHARLS_LIBS)
-+      message(STATUS "Warning: CharLS not found. Cannot build!")
-+    else(NOT CHARLS_LIBS)
-+      message(STATUS "Info: DCMTK CHARLS support will be enabled")
-+      set(WITH_CHARLS 1)
-+    endif(NOT CHARLS_LIBS)
-+  endif(DCMTK_WITH_CHARLS)
++set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake)
 +
- endif(WIN32 AND NOT MINGW)
- 
- if(NOT DEFINED DCMTK_WITH_STDLIBC_ICONV)
++if(DCMTK_WITH_CHARLS)
++  find_package(CharLS)
++  include_directories(${CHARLS_INCLUDE_DIRS})
++  set(CHARLS_LIBS ${CHARLS_LIBRARIES})
++  if (NOT CHARLS_LIBS)
++    message(STATUS "Warning: CharLS not found. Cannot build!")
++  else(NOT CHARLS_LIBS)
++    message(STATUS "Info: DCMTK CHARLS support will be enabled")
++    set(WITH_CHARLS 1)
++  endif(NOT CHARLS_LIBS)
++endif(DCMTK_WITH_CHARLS)
++
+ if(DCMTK_WITH_ICONV OR DCMTK_WITH_STDLIBC_ICONV)
+   include(CheckCXXSourceCompiles)
+   set(CMAKE_REQUIRED_INCLUDES ${LIBICONV_INCDIR})

diff --git a/dcmtk-3.6.1-0004-Use-cmake-suggested-location-for-CharLS.patch b/dcmtk-3.6.1-0004-Use-cmake-suggested-location-for-CharLS.patch
index efb37ae179ab1c5f67e4066ac7486a83cfa97135..720e040ed0b3fe491f40f265bd6e734f2d8b7a42 100644 (file)
--- a/dcmtk-3.6.1-0004-Use-cmake-suggested-location-for-CharLS.patch
+++ b/dcmtk-3.6.1-0004-Use-cmake-suggested-location-for-CharLS.patch
@@ -8,27 +8,20 @@ Subject: [PATCH] Use cmake suggested location for CharLS
  dcmjpls/libsrc/CMakeLists.txt | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/dcmjpls/apps/CMakeLists.txt b/dcmjpls/apps/CMakeLists.txt
-index 2e881d7..6170f8a 100644
---- a/dcmjpls/apps/CMakeLists.txt
-+++ b/dcmjpls/apps/CMakeLists.txt
-@@ -8,5 +8,5 @@
+--- dcmtk-3.6.6/dcmjpls/apps/CMakeLists.txt.orig       2021-08-28 22:06:28.200993561 +0200
++++ dcmtk-3.6.6/dcmjpls/apps/CMakeLists.txt    2021-08-29 12:52:13.793079185 +0200
+@@ -8,5 +8,5 @@ endforeach()
  
  # make sure executables are linked to the corresponding libraries
  foreach(PROGRAM dcmcjpls dcmdjpls dcml2pnm)
--  DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls charls dcmimage dcmimgle dcmdata oflog ofstd ofstd)
+-  DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls dcmtkcharls dcmimage dcmimgle dcmdata oflog ofstd ofstd)
 +  DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls ${CHARLS_LIBS} dcmimage dcmimgle dcmdata oflog ofstd ofstd)
  endforeach()
-diff --git a/dcmjpls/libsrc/CMakeLists.txt b/dcmjpls/libsrc/CMakeLists.txt
-index 8a7b4e8..dc3ff44 100644
---- a/dcmjpls/libsrc/CMakeLists.txt
-+++ b/dcmjpls/libsrc/CMakeLists.txt
-@@ -4,4 +4,4 @@ INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${
+--- dcmtk-3.6.6/dcmjpls/libsrc/CMakeLists.txt.orig     2021-01-14 15:16:29.000000000 +0100
++++ dcmtk-3.6.6/dcmjpls/libsrc/CMakeLists.txt  2021-08-29 12:52:38.419612438 +0200
+@@ -4,4 +4,4 @@ include_directories("${dcmjpls_SOURCE_DI
  # create library from source files
  DCMTK_ADD_LIBRARY(dcmjpls djcparam djdecode djencode djrparam djcodecd djutils djcodece)
  
--DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage charls)
+-DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage dcmtkcharls)
 +DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage ${CHARLS_LIBS})
--- 
-1.9.3
-

diff --git a/dcmtk.spec b/dcmtk.spec
index 4253cacb573ea4b0956e13ab48d6f9a6d0cd3bf4..075c9b4ea20b0df9c344a96e20adf131042112bb 100644 (file)
--- a/dcmtk.spec
+++ b/dcmtk.spec
@@ -11,12 +11,12 @@
 Summary:       DICOM Toolkit - implementation of DICOM/MEDICOM standard
 Summary(pl.UTF-8):     Narzędzia DICOM - implementacja standardu DICOM/MEDICOM
 Name:          dcmtk
-Version:       3.6.5
-Release:       4
+Version:       3.6.6
+Release:       1
 License:       BSD
 Group:         Libraries
 Source0:       https://dicom.offis.de/download/dcmtk/release/%{name}-%{version}.tar.gz
-# Source0-md5: e19707f64ee5695c496b9c1e48e39d07
+# Source0-md5: f815879d315b916366a9da71339c7575
 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
@@ -24,7 +24,7 @@ Patch3:               %{name}-3.6.1-0003-Create-FindCharLS.cmake.patch
 Patch4:                %{name}-3.6.1-0004-Use-cmake-suggested-location-for-CharLS.patch
 Patch5:                %{name}-etc.patch
 Patch6:                CharLS.patch
-URL:           http://dicom.offis.de/dcmtk
+URL:           https://dicom.offis.de/dcmtk
 BuildRequires: CharLS-devel < 2.0
 BuildRequires: cmake >= 2.8.5
 BuildRequires: doxygen
@@ -197,61 +197,64 @@ 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.15
+%attr(755,root,root) %ghost %{_libdir}/libcmr.so.16
 %attr(755,root,root) %{_libdir}/libdcmdata.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmdata.so.15
+%attr(755,root,root) %ghost %{_libdir}/libdcmdata.so.16
+%attr(755,root,root) %{_libdir}/libdcmect.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdcmect.so.16
 %attr(755,root,root) %{_libdir}/libdcmdsig.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmdsig.so.15
+%attr(755,root,root) %ghost %{_libdir}/libdcmdsig.so.16
 %attr(755,root,root) %{_libdir}/libdcmfg.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmfg.so.15
+%attr(755,root,root) %ghost %{_libdir}/libdcmfg.so.16
 %attr(755,root,root) %{_libdir}/libdcmimage.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmimage.so.15
+%attr(755,root,root) %ghost %{_libdir}/libdcmimage.so.16
 %attr(755,root,root) %{_libdir}/libdcmimgle.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmimgle.so.15
+%attr(755,root,root) %ghost %{_libdir}/libdcmimgle.so.16
 %attr(755,root,root) %{_libdir}/libdcmiod.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmiod.so.15
+%attr(755,root,root) %ghost %{_libdir}/libdcmiod.so.16
 %attr(755,root,root) %{_libdir}/libdcmjpeg.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmjpeg.so.15
+%attr(755,root,root) %ghost %{_libdir}/libdcmjpeg.so.16
 %attr(755,root,root) %{_libdir}/libdcmjpls.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmjpls.so.15
+%attr(755,root,root) %ghost %{_libdir}/libdcmjpls.so.16
 %attr(755,root,root) %{_libdir}/libdcmnet.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmnet.so.15
+%attr(755,root,root) %ghost %{_libdir}/libdcmnet.so.16
 %attr(755,root,root) %{_libdir}/libdcmpstat.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmpstat.so.15
+%attr(755,root,root) %ghost %{_libdir}/libdcmpstat.so.16
 %attr(755,root,root) %{_libdir}/libdcmqrdb.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmqrdb.so.15
+%attr(755,root,root) %ghost %{_libdir}/libdcmqrdb.so.16
 %attr(755,root,root) %{_libdir}/libdcmrt.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmrt.so.15
+%attr(755,root,root) %ghost %{_libdir}/libdcmrt.so.16
 %attr(755,root,root) %{_libdir}/libdcmseg.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmseg.so.15
+%attr(755,root,root) %ghost %{_libdir}/libdcmseg.so.16
 %attr(755,root,root) %{_libdir}/libdcmpmap.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmpmap.so.15
+%attr(755,root,root) %ghost %{_libdir}/libdcmpmap.so.16
 %attr(755,root,root) %{_libdir}/libdcmsr.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmsr.so.15
+%attr(755,root,root) %ghost %{_libdir}/libdcmsr.so.16
 %attr(755,root,root) %{_libdir}/libdcmtract.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmtract.so.15
+%attr(755,root,root) %ghost %{_libdir}/libdcmtract.so.16
 %attr(755,root,root) %{_libdir}/libdcmtls.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmtls.so.15
+%attr(755,root,root) %ghost %{_libdir}/libdcmtls.so.16
 %attr(755,root,root) %{_libdir}/libdcmwlm.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcmwlm.so.15
+%attr(755,root,root) %ghost %{_libdir}/libdcmwlm.so.16
 %attr(755,root,root) %{_libdir}/libi2d.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libi2d.so.15
+%attr(755,root,root) %ghost %{_libdir}/libi2d.so.16
 %attr(755,root,root) %{_libdir}/libijg12.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libijg12.so.15
+%attr(755,root,root) %ghost %{_libdir}/libijg12.so.16
 %attr(755,root,root) %{_libdir}/libijg16.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libijg16.so.15
+%attr(755,root,root) %ghost %{_libdir}/libijg16.so.16
 %attr(755,root,root) %{_libdir}/libijg8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libijg8.so.15
+%attr(755,root,root) %ghost %{_libdir}/libijg8.so.16
 %attr(755,root,root) %{_libdir}/liboflog.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liboflog.so.15
+%attr(755,root,root) %ghost %{_libdir}/liboflog.so.16
 %attr(755,root,root) %{_libdir}/libofstd.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libofstd.so.15
+%attr(755,root,root) %ghost %{_libdir}/libofstd.so.16
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcmr.so
 %attr(755,root,root) %{_libdir}/libdcmdata.so
 %attr(755,root,root) %{_libdir}/libdcmdsig.so
+%attr(755,root,root) %{_libdir}/libdcmect.so
 %attr(755,root,root) %{_libdir}/libdcmfg.so
 %attr(755,root,root) %{_libdir}/libdcmimage.so
 %attr(755,root,root) %{_libdir}/libdcmimgle.so