update to 3.6.1_20140617 [release 3.6.1_20140617-1mamba;Thu Jan 22 2015]

This commit is contained in:
Silvan Calarco 2024-01-05 21:40:51 +01:00
parent a7ac6e5a67
commit 50b520aa6f
3 changed files with 93 additions and 159 deletions

View File

@ -1,7 +1,4 @@
# dcmtk
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.
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.

View File

@ -1,37 +0,0 @@
--- config/Makefile.def.in 2010-10-08 12:52:28.000000000 +0200
+++ config/Makefile.def.in-gil 2011-02-03 09:30:29.000000000 +0100
@@ -63,14 +63,18 @@
# ARCH =
CC = @CC@
-CFLAGS = @CFLAGS@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
+SHARED_FLAGS = -fPIC -O2
+CFLAGS = $(SHARED_FLAGS) @CFLAGS@
+CXX = @CXX@
+CXXFLAGS = $(SHARED_FLAGS) @CXXFLAGS@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
-RANLIB = @RANLIB@
-AR = @AR@
-ARFLAGS = @ARFLAGS@
+# RANLIB = @RANLIB@
+RANLIB = :
+# AR = @AR@
+AR = gcc
+# ARFLAGS = @ARFLAGS@
+ARFLAGS = -shared -o
LIBS = @LIBS@
MATHLIBS = @MATHLIBS@
OPENSSLLIBS = @OPENSSLLIBS@
@@ -80,7 +84,8 @@
XMLLIBS = @XMLLIBS@
TCPWRAPPERLIBS = @TCPWRAPPERLIBS@
SNDFILELIBS = @SNDFILELIBS@
-LIBEXT = @LIBEXT@
+#LIBEXT = @LIBEXT@
+LIBEXT = so
BINEXT = @BINEXT@
#

View File

@ -1,24 +1,20 @@
Name: dcmtk
Version: 3.6.0
Version: 3.6.1_20140617
Release: 1mamba
Summary: The OFFIS DICOM toolkit command line utilities
Group: System/Tools
Vendor: openmamba
Distribution: openmamba
Packager: gil <puntogil@libero.it>
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://dicom.offis.de/dcmtk.php.en
Source0: ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk360/dcmtk-%{version}.tar.gz
Patch0: dcmtk-3.6.0-shared.patch
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
BuildRequires: dos2unix
BuildRequires: doxygen
BuildRequires: libsndfile-devel
BuildRequires: libtool
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: libgcc
BuildRequires: libjpeg-turbo-devel
BuildRequires: libjpeg-devel
BuildRequires: libopenssl-devel
BuildRequires: libpng-devel
BuildRequires: libstdc++6-devel
@ -27,25 +23,23 @@ BuildRequires: libwrap-devel
BuildRequires: libxml2-devel
BuildRequires: libz-devel
## AUTOBUILDREQ-END
Requires: libdcmtk
BuildRequires: dos2unix
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.
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.
%package -n libdcmtk
Group: System/Libraries
Summary: The OFFIS DICOM toolkit runtime libraries
Requires: libdcmtk = %{?epoch:%epoch:}%{version}-%{release}
%description -n libdcmtk
DCMTK - OFFIS DICOM Toolkit command line utilities.
This package contains the runtime libraries for the DCMTK utility
applications.
This package contains the runtime libraries for the DCMTK utility applications.
%package -n libdcmtk-devel
Group: Development/Libraries
@ -54,62 +48,34 @@ Requires: libdcmtk = %{?epoch:%epoch:}%{version}-%{release}
%description -n libdcmtk-devel
DCMTK - OFFIS DICOM Toolkit command line utilities.
This package contains development libraries and headers for DCMTK.
%prep
%setup -q
%patch0 -p0
%patch1 -p0
for e in $(find . -name "*.exe"); do
rm -rf $e
done
#test -r config/lzwtest.tif && rm -f config/lzwtest.tif
for d in $(find . -name "*.dll"); do
rm -rf $d
done
for s in $(find . -name "*.so"); do
rm -rf $s
done
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
#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 \
-DDCMTK_INSTALL_ETCDIR=%{_sysconfdir}/dcmtk \
-DDCMTK_INSTALL_CMKDIR=%{_lib}/cmake/dcmtk \
-DDCMTK_INSTALL_LIBDIR=%{_lib} \
cd config && ./autoall && cd .. && \
./configure \
--host=%{_host} \
--build=%{_build} \
--prefix=%{_prefix} \
--exec-prefix=%{_exec_prefix} \
--mandir=%{_mandir} \
--infodir=%{_infodir} \
--includedir=%{_includedir} \
--libdir=%{_libdir} \
--datadir=%{_datadir} \
--sysconfdir=%{_sysconfdir}/dcmtk \
--with-private-tags \
--with-libxml \
--with-libtiff \
--with-zlib \
--with-libpng \
--with-libwrap \
--with-openssl
make
%make
%install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
make install DESTDIR=%{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}
@ -127,10 +93,14 @@ 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}"
%post -n libdcmtk -p /sbin/ldconfig
%postun -n libdcmtk -p /sbin/ldconfig
%files
%defattr(-,root,root)
%dir %{_sysconfdir}/dcmtk
@ -141,40 +111,7 @@ mv %{buildroot}%{_datadir}/*.css %{buildroot}%{_datadir}/dcmtk
%config(noreplace) %{_sysconfdir}/dcmtk/printers.cfg
%config(noreplace) %{_sysconfdir}/dcmtk/storescp.cfg
%config(noreplace) %{_sysconfdir}/dcmtk/storescu.cfg
%{_bindir}/dcm2pdf
%{_bindir}/dcm2pnm
%{_bindir}/dcm2xml
%{_bindir}/dcmcjpeg
%{_bindir}/dcmcjpls
%{_bindir}/dcmconv
%{_bindir}/dcmcrle
%{_bindir}/dcmdjpeg
%{_bindir}/dcmdjpls
%{_bindir}/dcmdrle
%{_bindir}/dcmdspfn
%{_bindir}/dcmdump
%{_bindir}/dcmftest
%{_bindir}/dcmgpdir
%{_bindir}/dcmj2pnm
%{_bindir}/dcml2pnm
%{_bindir}/dcmmkcrv
%{_bindir}/dcmmkdir
%{_bindir}/dcmmklut
%{_bindir}/dcmodify
%{_bindir}/dcmp2pgm
%{_bindir}/dcmprscp
%{_bindir}/dcmprscu
%{_bindir}/dcmpschk
%{_bindir}/dcmpsmk
%{_bindir}/dcmpsprt
%{_bindir}/dcmpsrcv
%{_bindir}/dcmpssnd
%{_bindir}/dcmqridx
%{_bindir}/dcmqrscp
%{_bindir}/dcmqrti
%{_bindir}/dcmquant
%{_bindir}/dcmscale
%{_bindir}/dcmsign
%{_bindir}/dcm*
%{_bindir}/dcod2lum
%{_bindir}/dconvlum
%{_bindir}/dsr2html
@ -192,6 +129,15 @@ mv %{buildroot}%{_datadir}/*.css %{buildroot}%{_datadir}/dcmtk
%{_bindir}/wlmscpfs
%{_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
@ -202,34 +148,32 @@ mv %{buildroot}%{_datadir}/*.css %{buildroot}%{_datadir}/dcmtk
%{_datadir}/dcmtk/*.css
%{_datadir}/dcmtk/wlistdb
%{_datadir}/dcmtk/wlistqry
%{_mandir}/man1/*.1.gz
%dir %{_docdir}/dcmtk-%{version}
%doc %{_docdir}/dcmtk-%{version}/*
%post -n libdcmtk -p /sbin/ldconfig
%postun -n libdcmtk -p /sbin/ldconfig
#%{_mandir}/man1/*.1.gz
#%dir %{_docdir}/dcmtk-%{version}
#%doc %{_docdir}/dcmtk-%{version}/*
%files -n libdcmtk
%defattr(-,root,root)
%{_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}/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
%{_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.*
%files -n libdcmtk-devel
%defattr(-,root,root)
@ -244,12 +188,42 @@ mv %{buildroot}%{_datadir}/*.css %{buildroot}%{_datadir}/dcmtk
%{_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/DCMTKTargets-release.cmake
%{_libdir}/cmake/dcmtk/DCMTKTargets.cmake
%dir %{_docdir}/dcmtk
%{_docdir}/dcmtk/*
%changelog
* Thu Jan 22 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 3.6.1_20140617-1mamba
- update to 3.6.1_20140617
* Wed Feb 02 2011 gil <puntogil@libero.it> 3.6.0-1mamba
- package created by autospec