[packages/dcmtk] - use C++11 STL features instead of custom code - not ready for CharLS 2.0 yet
qboosh
qboosh at pld-linux.org
Fri Sep 16 18:21:54 CEST 2016
commit 5d98c3a535d6b3616418c3abdf67e2ea31733e9a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Sep 16 18:23:29 2016 +0200
- use C++11 STL features instead of custom code
- not ready for CharLS 2.0 yet
dcmtk.spec | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/dcmtk.spec b/dcmtk.spec
index 40e5826..13e72a3 100644
--- a/dcmtk.spec
+++ b/dcmtk.spec
@@ -20,10 +20,10 @@ 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
URL: http://dicom.offis.de/dcmtk
-BuildRequires: CharLS-devel
+BuildRequires: CharLS-devel < 2.0
BuildRequires: cmake >= 2.4
BuildRequires: libpng-devel >= 2:1.2.8
-BuildRequires: libstdc++-devel
+BuildRequires: libstdc++-devel >= 6:4.8.1
BuildRequires: libtiff-devel >= 3.7.0
BuildRequires: libwrap-devel
BuildRequires: libxml2-devel >= 1:2.6.26
@@ -44,6 +44,7 @@ implementujących część standardu DICOM/MEDICOM.
Summary: DICOM ToolKit shared libraries
Summary(pl.UTF-8): Biblioteki współdzielone DICOM
Group: Libraries
+Requires: libstdc++ >= 6:4.8.1
%description libs
DICOM ToolKit shared libraries.
@@ -56,7 +57,7 @@ Summary: Header files for DCMTK libraries
Summary(pl.UTF-8): Pliki nagłówkowe bibliotek DCMTK
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-Requires: libstdc++-devel
+Requires: libstdc++-devel >= 6:4.8.1
%description devel
Header files for DCMTK libraries.
@@ -83,6 +84,7 @@ Pliki nagłówkowe bibliotek DCMTK.
-DDCMTK_INSTALL_CMKDIR=%{_lib}/cmake/dcmtk \
-DBUILD_APPS:BOOL=ON \
-DBUILD_SHARED_LIBS:BOOL=ON \
+ -DDCMTK_USE_CXX11_STL:BOOL=ON \
-DDCMTK_WITH_OPENSSL:BOOL=ON \
-DDCMTK_WITH_PNG:BOOL=ON \
-DDCMTK_WITH_PRIVATE_TAGS:BOOL=ON \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dcmtk.git/commitdiff/5d98c3a535d6b3616418c3abdf67e2ea31733e9a
More information about the pld-cvs-commit
mailing list