diff --git a/dcmtk-3.6.0-dcmjpls.patch b/dcmtk-3.6.0-dcmjpls.patch deleted file mode 100644 index 72f56a7..0000000 --- a/dcmtk-3.6.0-dcmjpls.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- dcmjpls/apps/Makefile.in 2010-10-14 15:20:22.000000000 +0200 -+++ dcmjpls/apps/Makefile.in-gil 2011-02-03 09:37:19.000000000 +0100 -@@ -59,10 +59,10 @@ - all: $(progs) - - dcmdjpls: dcmdjpls.o -- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBDIRS) -o $@ $@.o $(LOCALLIBS) $(MATHLIBS) $(LIBS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBDIRS) -o $@ $@.o $(LOCALLIBS) $(MATHLIBS) $(LIBS) $(TIFFLIBS) $(PNGLIBS) - - dcmcjpls: dcmcjpls.o -- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBDIRS) -o $@ $@.o $(LOCALLIBS) $(MATHLIBS) $(LIBS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBDIRS) -o $@ $@.o $(LOCALLIBS) $(MATHLIBS) $(LIBS) $(TIFFLIBS) $(PNGLIBS) - - dcml2pnm: dcml2pnm.o - $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBDIRS) -o $@ $@.o $(LOCALLIBS) $(PNMLIBS) $(MATHLIBS) $(LIBS) diff --git a/dcmtk-3.6.8-cmake-unversioned-datadir.patch b/dcmtk-3.6.8-cmake-unversioned-datadir.patch new file mode 100644 index 0000000..100cdd8 --- /dev/null +++ b/dcmtk-3.6.8-cmake-unversioned-datadir.patch @@ -0,0 +1,15 @@ +--- 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}/") diff --git a/dcmtk.spec b/dcmtk.spec index 45a7828..47bcc16 100644 --- a/dcmtk.spec +++ b/dcmtk.spec @@ -1,5 +1,5 @@ Name: dcmtk -Version: 3.6.7 +Version: 3.6.8 Release: 1mamba Summary: The OFFIS DICOM toolkit command line utilities Group: System/Tools @@ -8,7 +8,7 @@ Distribution: openmamba Packager: Silvan Calarco URL: https://dicom.offis.de/dcmtk.php.en Source0: git://git.dcmtk.org/dcmtk.git/DCMTK-%{version}/dcmtk-%{version}.tar.bz2 -Patch1: dcmtk-3.6.0-dcmjpls.patch +Patch0: dcmtk-3.6.8-cmake-unversioned-datadir.patch License: BSD ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -16,8 +16,10 @@ BuildRequires: libgcc BuildRequires: libicu-devel BuildRequires: libjpeg-devel BuildRequires: libnsl-devel +BuildRequires: libopenjpeg-devel BuildRequires: libopenssl-devel BuildRequires: libpng-devel +BuildRequires: libsndfile-devel BuildRequires: libstdc++6-devel BuildRequires: libtiff-devel BuildRequires: libwrap-devel @@ -54,13 +56,15 @@ This package contains development libraries and headers for DCMTK. %prep %setup -q +%patch 0 -p1 %build %cmake -d build \ -DBUILD_SHARED_LIB=ON \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \ -DCMAKE_INSTALL_LIBDIR=%{_lib} \ - -DDCMTK_INSTALL_ETCDIR=%{_sysconfdir}/dcmtk \ + -DCMAKE_INSTALL_DATADIR=%{_datadir} \ -DDCMTK_INSTALL_CMKDIR=%{_lib}/cmake/dcmtk %make @@ -69,9 +73,6 @@ This package contains development libraries and headers for DCMTK. [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall -C build -# Move configuration files from /usr/etc to /etc -mv %{buildroot}/usr/etc %{buildroot} - %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -92,15 +93,22 @@ mv %{buildroot}/usr/etc %{buildroot} %{_bindir}/cda2dcm %{_bindir}/dcod2lum %{_bindir}/dconvlum +%{_bindir}/drtdump +%{_bindir}/drttest %{_bindir}/dsr2html %{_bindir}/dsr2xml %{_bindir}/dsrdump %{_bindir}/dump2dcm %{_bindir}/echoscu %{_bindir}/findscu +%{_bindir}/getscu %{_bindir}/img2dcm +%{_bindir}/mkcsmapper +%{_bindir}/mkesdb %{_bindir}/movescu %{_bindir}/msgserv +%{_bindir}/oficonv_tests +%{_bindir}/ofstd_tests %{_bindir}/pdf2dcm %{_bindir}/stl2dcm %{_bindir}/storescp @@ -110,15 +118,7 @@ mv %{buildroot}/usr/etc %{buildroot} %{_bindir}/wltest %{_bindir}/xml2dcm %{_bindir}/xml2dsr -%{_bindir}/drtdump -%{_bindir}/drttest -%{_bindir}/getscu %{_bindir}/mkreport -%{_bindir}/ofstd_tests -#%{_bindir}/preplock -#%{_bindir}/readoviw -#%{_bindir}/readwlst -#%{_bindir}/writwlst %dir %{_datadir}/dcmtk %{_datadir}/dcmtk/*.dump %{_datadir}/dcmtk/*.lut @@ -129,13 +129,16 @@ mv %{buildroot}/usr/etc %{buildroot} %{_datadir}/dcmtk/*.css %{_datadir}/dcmtk/wlistdb %{_datadir}/dcmtk/wlistqry +%dir %{_datadir}/dcmtk/csmapper +%{_datadir}/dcmtk/csmapper/* +%dir %{_datadir}/dcmtk/esdb +%{_datadir}/dcmtk/esdb/* %{_mandir}/man1/*.1* -#%dir %{_docdir}/dcmtk-%{version} -#%doc %{_docdir}/dcmtk-%{version}/* %files -n libdcmtk %defattr(-,root,root) %{_libdir}/lib*.so.* +%doc COPYRIGHT %files -n libdcmtk-devel %defattr(-,root,root) @@ -149,6 +152,9 @@ mv %{buildroot}/usr/etc %{buildroot} %{_libdir}/pkgconfig/dcmtk.pc %changelog +* Sat Feb 03 2024 Automatic Build System 3.6.8-1mamba +- automatic version update by autodist + * Mon May 16 2022 Automatic Build System 3.6.7-1mamba - automatic version update by autodist