update to 3.6.6 [release 3.6.6-1mamba;Sun Jun 20 2021]

dcmtk.spec

@@ -1,5 +1,5 @@
 Name:          dcmtk
-Version:       3.6.1_20140617
+Version:       3.6.6
 Release:       1mamba
 Summary:       The OFFIS DICOM toolkit command line utilities
 Group:         System/Tools
@@ -8,13 +8,14 @@ Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://dicom.offis.de/dcmtk.php.en
 Source0:       git://git.dcmtk.org/dcmtk.git/DCMTK-%{version}/dcmtk-%{version}.tar.bz2
-#ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk360/dcmtk-%{version}.tar.gz
 Patch1:        dcmtk-3.6.0-dcmjpls.patch
 License:       BSD
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
 BuildRequires: libgcc
+BuildRequires: libicu-devel
 BuildRequires: libjpeg-devel
+BuildRequires: libnsl-devel
 BuildRequires: libopenssl-devel
 BuildRequires: libpng-devel
 BuildRequires: libstdc++6-devel
@@ -28,7 +29,6 @@ BuildRequires: doxygen
 BuildRequires: libsndfile-devel
 BuildRequires: libtool
 Requires:      libdcmtk = %{?epoch:%epoch:}%{version}-%{release}
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 DCMTK includes a collection of libraries and applications for examining, constructing and converting DICOM image files, handling offline media, sending and receiving images over a network connection, as well as demonstrative image storage and worklist servers.
@@ -50,21 +50,18 @@ 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
 
-#test -r config/lzwtest.tif &&  rm -f config/lzwtest.tif
-
-#cp -f %{_datadir}/libtool/config/config.sub config/config.sub
-#cp -f %{_datadir}/libtool/config/config.guess config/config.guess
-
 %build
 %cmake -d build \
    -DBUILD_SHARED_LIB=ON \
+   -DCMAKE_INSTALL_PREFIX=/ \
    -DDCMTK_INSTALL_ETCDIR=%{_sysconfdir}/dcmtk \
-   -DDCMTK_INSTALL_CMKDIR=%{_lib}/cmake/dcmtk \
+   -DDCMTK_INSTALL_CMKDIR=%{_libdir}/cmake/dcmtk \
-   -DDCMTK_INSTALL_LIBDIR=%{_lib} \
+   -DDCMTK_INSTALL_LIBDIR=%{_libdir}
-   
    
 %make
 
@@ -72,29 +69,6 @@ This package contains development libraries and headers for DCMTK.
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 %makeinstall -C build
 
-:<< _OLD
-for t in data doc etc lib include support man html; do
-  make install-$t DESTDIR=%{buildroot}
-done
-chmod 755 %{buildroot}%{_libdir}/*.so
-
-mv %{buildroot}%{_docdir}/dcmtk %{buildroot}%{_docdir}/dcmtk-%{version}
-cp -pr README %{buildroot}%{_docdir}/dcmtk-%{version}
-
-# sample
-mkdir -p %{buildroot}%{_datadir}/dcmtk
-mv %{buildroot}%{_datadir}/wlistdb %{buildroot}%{_datadir}/dcmtk
-mv %{buildroot}%{_datadir}/wlistqry %{buildroot}%{_datadir}/dcmtk
-
-mv %{buildroot}%{_datadir}/*.dump %{buildroot}%{_datadir}/dcmtk
-mv %{buildroot}%{_datadir}/*.lut %{buildroot}%{_datadir}/dcmtk
-mv %{buildroot}%{_datadir}/*.dtd %{buildroot}%{_datadir}/dcmtk
-mv %{buildroot}%{_datadir}/*.dic %{buildroot}%{_datadir}/dcmtk
-mv %{buildroot}%{_datadir}/*.xsd %{buildroot}%{_datadir}/dcmtk
-mv %{buildroot}%{_datadir}/*.txt %{buildroot}%{_datadir}/dcmtk
-mv %{buildroot}%{_datadir}/*.css %{buildroot}%{_datadir}/dcmtk
-_OLD
-
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
@@ -112,6 +86,7 @@ _OLD
 %config(noreplace) %{_sysconfdir}/dcmtk/storescp.cfg
 %config(noreplace) %{_sysconfdir}/dcmtk/storescu.cfg
 %{_bindir}/dcm*
+%{_bindir}/cda2dcm
 %{_bindir}/dcod2lum
 %{_bindir}/dconvlum
 %{_bindir}/dsr2html
@@ -122,11 +97,14 @@ _OLD
 %{_bindir}/findscu
 %{_bindir}/img2dcm
 %{_bindir}/movescu
+%{_bindir}/msgserv
 %{_bindir}/pdf2dcm
+%{_bindir}/stl2dcm
 %{_bindir}/storescp
 %{_bindir}/storescu
 %{_bindir}/termscu
 %{_bindir}/wlmscpfs
+%{_bindir}/wltest
 %{_bindir}/xml2dcm
 %{_bindir}/xml2dsr
 %{_bindir}/drtdump
@@ -134,10 +112,10 @@ _OLD
 %{_bindir}/getscu
 %{_bindir}/mkreport
 %{_bindir}/ofstd_tests
-%{_bindir}/preplock
+#%{_bindir}/preplock
-%{_bindir}/readoviw
+#%{_bindir}/readoviw
-%{_bindir}/readwlst
+#%{_bindir}/readwlst
-%{_bindir}/writwlst
+#%{_bindir}/writwlst
 %dir %{_datadir}/dcmtk
 %{_datadir}/dcmtk/*.dump
 %{_datadir}/dcmtk/*.lut
@@ -148,80 +126,28 @@ _OLD
 %{_datadir}/dcmtk/*.css
 %{_datadir}/dcmtk/wlistdb
 %{_datadir}/dcmtk/wlistqry
-#%{_mandir}/man1/*.1.gz
+%{_mandir}/man1/*.1*
 #%dir %{_docdir}/dcmtk-%{version}
 #%doc %{_docdir}/dcmtk-%{version}/*
 
 %files -n libdcmtk
 %defattr(-,root,root)
-%{_libdir}/libcharls.so.*
+%{_libdir}/lib*.so.*
-%{_libdir}/libdcmdata.so.*
-%{_libdir}/libdcmdsig.so.*
-%{_libdir}/libdcmimage.so.*
-%{_libdir}/libdcmimgle.so.*
-%{_libdir}/libdcmjpeg.so.*
-%{_libdir}/libdcmjpls.so.*
-%{_libdir}/libdcmnet.so.*
-%{_libdir}/libdcmpstat.so.*
-%{_libdir}/libdcmqrdb.so.*
-%{_libdir}/libdcmrt.so.*
-%{_libdir}/libdcmsr.so.*
-%{_libdir}/libdcmtls.so.*
-%{_libdir}/libdcmwlm.so.*
-%{_libdir}/libi2d.so.*
-%{_libdir}/libijg12.so.*
-%{_libdir}/libijg16.so.*
-%{_libdir}/libijg8.so.*
-%{_libdir}/liboflog.so.*
-%{_libdir}/libofstd.so.*
 
 %files -n libdcmtk-devel
 %defattr(-,root,root)
 %dir %{_includedir}/dcmtk
-%{_includedir}/dcmtk/config
+%{_includedir}/dcmtk/*
-%{_includedir}/dcmtk/dcmdata
+%{_libdir}/lib*.so
-%{_includedir}/dcmtk/dcmimage
-%{_includedir}/dcmtk/dcmimgle
-%{_includedir}/dcmtk/dcmjpeg
-%{_includedir}/dcmtk/dcmjpls
-%{_includedir}/dcmtk/dcmnet
-%{_includedir}/dcmtk/dcmpstat
-%{_includedir}/dcmtk/dcmqrdb
-%{_includedir}/dcmtk/dcmsign
-%{_includedir}/dcmtk/dcmrt
-%{_includedir}/dcmtk/dcmsr
-%{_includedir}/dcmtk/dcmtls
-%{_includedir}/dcmtk/dcmwlm
-%{_includedir}/dcmtk/oflog
-%{_includedir}/dcmtk/ofstd
-%{_libdir}/libcharls.so
-%{_libdir}/libdcmdata.so
-%{_libdir}/libdcmdsig.so
-%{_libdir}/libdcmimage.so
-%{_libdir}/libdcmimgle.so
-%{_libdir}/libdcmjpeg.so
-%{_libdir}/libdcmjpls.so
-%{_libdir}/libdcmnet.so
-%{_libdir}/libdcmpstat.so
-%{_libdir}/libdcmqrdb.so
-%{_libdir}/libdcmrt.so
-%{_libdir}/libdcmsr.so
-%{_libdir}/libdcmtls.so
-%{_libdir}/libdcmwlm.so
-%{_libdir}/libi2d.so
-%{_libdir}/libijg12.so
-%{_libdir}/libijg16.so
-%{_libdir}/libijg8.so
-%{_libdir}/liboflog.so
-%{_libdir}/libofstd.so
 %dir %{_libdir}/cmake/dcmtk
-%{_libdir}/cmake/dcmtk/DCMTKConfig.cmake
+%{_libdir}/cmake/dcmtk/DCMTK*.cmake
-%{_libdir}/cmake/dcmtk/DCMTKTargets-release.cmake
-%{_libdir}/cmake/dcmtk/DCMTKTargets.cmake
 %dir %{_docdir}/dcmtk
 %{_docdir}/dcmtk/*
 
 %changelog
+* Sun Jun 20 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 3.6.6-1mamba
+- update to 3.6.6
+
 * Thu Jan 22 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 3.6.1_20140617-1mamba
 - update to 3.6.1_20140617