rpms/dcmtk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 3.6.9 [release 3.6.9-1mamba;Sun Jun 01 2025]

Browse Source
This commit is contained in:
Silvan Calarco
2025-07-30 22:33:52 +02:00
parent 2fde686fbf
commit 595613ec87
3 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dcmtk-3.6.8-cmake-unversioned-datadir.patch
View File

@@ -1,15 +0,0 @@
--- dcmtk-3.6.8/CMake/GenerateDCMTKConfigure.cmake.orig 2024-02-03 10:25:49.563019822 +0100
+++ dcmtk-3.6.8/CMake/GenerateDCMTKConfigure.cmake 2024-02-03 10:26:28.249094925 +0100
@@ -202,9 +202,9 @@
# 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_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}")
- set(CMAKE_INSTALL_FULL_DOCDIR "${CMAKE_INSTALL_FULL_DOCDIR}-${DCMTK_COMPLETE_PACKAGE_VERSION}")
+ set(CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/dcmtk")
+ set(CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/dcmtk")
+ set(CMAKE_INSTALL_FULL_DOCDIR "${CMAKE_INSTALL_FULL_DOCDIR}")
# These variables are defined as macros in osconfig.h and must end with a path separator
set(DCMTK_DEFAULT_CONFIGURATION_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/")

17
dcmtk-3.6.9-cmake-unversioned-datadir.patch Normal file
View File

@@ -0,0 +1,17 @@
diff --git a/CMake/GenerateDCMTKConfigure.cmake b/CMake/GenerateDCMTKConfigure.cmake
index a3856d3d0..235e27c0f 100644
--- a/CMake/GenerateDCMTKConfigure.cmake
+++ b/CMake/GenerateDCMTKConfigure.cmake
@@ -193,12 +193,6 @@ else()
set(PATH_SEPARATOR "/")
set(ENVIRONMENT_PATH_SEPARATOR ":")
- # 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_SYSCONFDIR "${CMAKE_INSTALL_SYSCONFDIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}")
- set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}")
- set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DOCDIR}-${DCMTK_COMPLETE_PACKAGE_VERSION}")
-
# These variables are defined as macros in osconfig.h and must end with a path separator
if(CMAKE_VERSION VERSION_LESS 3.20.0)
# CMake versions prior to 3.20 expect the third parameter to be passed in ${dir}

29
dcmtk.spec
View File

@@ -1,5 +1,5 @@
Name: dcmtk
Version: 3.6.8
Version: 3.6.9
Release: 1mamba
Summary: The OFFIS DICOM toolkit command line utilities
Group: System/Tools
@@ -7,14 +7,13 @@ Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://dicom.offis.de/dcmtk.php.en
Source0: git://git.dcmtk.org/dcmtk.git/DCMTK-%{version}/dcmtk-%{version}.tar.bz2
Patch0: dcmtk-3.6.8-cmake-unversioned-datadir.patch
Source0: https://git.dcmtk.org/dcmtk.git/DCMTK-%{version}/dcmtk-%{version}.tar.bz2
Patch0: dcmtk-3.6.9-cmake-unversioned-datadir.patch
License: BSD
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: libgcc
BuildRequires: libicu-devel
BuildRequires: libjpeg-devel
BuildRequires: libjpeg-turbo
BuildRequires: libnsl-devel
BuildRequires: libopenjpeg-devel
BuildRequires: libopenssl-devel
@@ -52,8 +51,6 @@ Requires: libdcmtk = %{?epoch:%epoch:}%{version}-%{release}
DCMTK - OFFIS DICOM Toolkit command line utilities.
This package contains development libraries and headers for DCMTK.
%debug_package
%prep
%setup -q
%patch 0 -p1
@@ -62,9 +59,9 @@ This package contains development libraries and headers for DCMTK.
%cmake -d build \
-DBUILD_SHARED_LIB=ON \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \
-DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir}/%{name} \
-DCMAKE_INSTALL_LIBDIR=%{_lib} \
-DCMAKE_INSTALL_DATADIR=%{_datadir} \
-DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \
-DDCMTK_INSTALL_CMKDIR=%{_lib}/cmake/dcmtk
%make
@@ -76,12 +73,11 @@ This package contains development libraries and headers for DCMTK.
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%post -n libdcmtk -p /sbin/ldconfig
%postun -n libdcmtk -p /sbin/ldconfig
%files
%defattr(-,root,root)
%dir %{_sysconfdir}/dcmtk
%config(noreplace) %{_sysconfdir}/dcmtk/consolog.cfg
%config(noreplace) %{_sysconfdir}/dcmtk/dcmqrprf.cfg
%config(noreplace) %{_sysconfdir}/dcmtk/dcmpstat.cfg
%config(noreplace) %{_sysconfdir}/dcmtk/dcmqrscp.cfg
%config(noreplace) %{_sysconfdir}/dcmtk/filelog.cfg
@@ -94,7 +90,6 @@ This package contains development libraries and headers for DCMTK.
%{_bindir}/dcod2lum
%{_bindir}/dconvlum
%{_bindir}/drtdump
%{_bindir}/drttest
%{_bindir}/dsr2html
%{_bindir}/dsr2xml
%{_bindir}/dsrdump
@@ -106,19 +101,14 @@ This package contains development libraries and headers for DCMTK.
%{_bindir}/mkcsmapper
%{_bindir}/mkesdb
%{_bindir}/movescu
%{_bindir}/msgserv
%{_bindir}/oficonv_tests
%{_bindir}/ofstd_tests
%{_bindir}/pdf2dcm
%{_bindir}/stl2dcm
%{_bindir}/storescp
%{_bindir}/storescu
%{_bindir}/termscu
%{_bindir}/wlmscpfs
%{_bindir}/wltest
%{_bindir}/xml2dcm
%{_bindir}/xml2dsr
%{_bindir}/mkreport
%dir %{_datadir}/dcmtk
%{_datadir}/dcmtk/*.dump
%{_datadir}/dcmtk/*.lut
@@ -152,6 +142,9 @@ This package contains development libraries and headers for DCMTK.
%{_libdir}/pkgconfig/dcmtk.pc
%changelog
* Sun Jun 01 2025 Silvan Calarco <silvan.calarco@mambasoft.it> 3.6.9-1mamba
- update to 3.6.9
* Sat Feb 03 2024 Automatic Build System <autodist@openmamba.org> 3.6.8-1mamba
- automatic version update by autodist