diff --git a/.gitignore b/.gitignore index 0629cd5..4b8fbac 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /CTK-bdc8caca0458759e1672a94ca2857595d40f17b0.tar.gz /CTK-71799c27da506c899f2ef04b50cd8d454374870d.tar.gz +/CTK-2018-10-29.tar.gz diff --git a/ctk-DCMTK_3.6.4_updated_function.patch b/ctk-DCMTK_3.6.4_updated_function.patch new file mode 100644 index 0000000..fb09dfa --- /dev/null +++ b/ctk-DCMTK_3.6.4_updated_function.patch @@ -0,0 +1,54 @@ +From 42113618abda2260f7039878cd71cdb19d62eaca Mon Sep 17 00:00:00 2001 +From: Hans Johnson +Date: Mon, 31 Dec 2018 07:30:51 -0700 +Subject: [PATCH] COMP: DCMTK 3.6.4 updated function signatures + +The locking mechanism for the dcmtk global +dictionary was changed to support: + +Class OFReadWriteLock now uses SRW locks on Windows. + +Unfortunately SRW locks require different functions for unlocking read +and write locks, which causes an API change in class OFReadWriteLock and +in class GlobalDcmDataDictionary (which internally uses a read/write +lock to protect access to the DICOM dictionary.) +--- + Libs/DICOM/Core/ctkDICOMItem.cpp | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/Libs/DICOM/Core/ctkDICOMItem.cpp b/Libs/DICOM/Core/ctkDICOMItem.cpp +index f987b1fd6..be33e9054 100644 +--- a/Libs/DICOM/Core/ctkDICOMItem.cpp ++++ b/Libs/DICOM/Core/ctkDICOMItem.cpp +@@ -21,6 +21,7 @@ + + #include "ctkDICOMItem.h" + ++#include + #include + #include + #include +@@ -950,7 +951,11 @@ QString ctkDICOMItem::TagDescription( const DcmTag& tag ) + { + returnName = entry->getTagName(); + } ++#if OFFIS_DCMTK_VERSION_NUMBER < 364 + dcmDataDict.unlock(); ++#else ++ dcmDataDict.rdunlock(); ++#endif + return returnName; + } + +@@ -964,7 +969,11 @@ QString ctkDICOMItem::TagVR( const DcmTag& tag ) + { + returnVR = entry->getVR().getVRName(); + } ++#if OFFIS_DCMTK_VERSION_NUMBER < 364 + dcmDataDict.unlock(); ++#else ++ dcmDataDict.rdunlock(); ++#endif + return returnVR; + } + diff --git a/ctk.spec b/ctk.spec index f4dbd2c..869b2f0 100644 --- a/ctk.spec +++ b/ctk.spec @@ -3,27 +3,28 @@ %global checkout 20171224git%{comm} %global _docdir_fmt %{name} -Name: ctk -Version: 0.1 -Release: 0.11.%{checkout}%{?dist} -Summary: The Commmon Toolkit for biomedical imaging - -License: ASL 2.0 -URL: http://www.commontk.org -Source0: https://github.com/commontk/CTK/archive/%{commit}.tar.gz#/CTK-%{commit}.tar.gz - -Patch0: %{name}-0.1.20171224git71799c2-fix_qreal_cast.patch - -BuildRequires: gcc-c++ -BuildRequires: cmake -BuildRequires: doxygen -BuildRequires: graphviz -BuildRequires: dcmtk-devel -BuildRequires: gdcm-devel -BuildRequires: libjpeg-turbo-devel -BuildRequires: libxml2-devel -BuildRequires: openssl-devel -BuildRequires: qt-devel +Name: ctk +Version: 0.1 +Release: 20181029.1%{?dist} +Summary: The Commmon Toolkit for biomedical imaging + +License: ASL 2.0 +URL: http://www.commontk.org +Source0: https://github.com/commontk/CTK/archive/2018-10-29/CTK-2018-10-29.tar.gz + +Patch0: %{name}-%{version}.%{checkout}-fix_qreal_cast.patch +Patch1: %{name}-DCMTK_3.6.4_updated_function.patch + +BuildRequires: gcc-c++ +BuildRequires: cmake +BuildRequires: doxygen +BuildRequires: graphviz +BuildRequires: dcmtk-devel +BuildRequires: gdcm-devel +BuildRequires: libjpeg-turbo-devel +BuildRequires: libxml2-devel +BuildRequires: openssl-devel +BuildRequires: qt-devel %description The Common Toolkit is a community effort to provide support code for medical @@ -34,7 +35,7 @@ This package contains the CTK Core library. %package dicom -Summary: Library of high-level classes for querying PACS and local databases +Summary: Library of high-level classes for querying PACS and local databases %description dicom The Common Toolkit is a community effort to provide support code for medical @@ -47,7 +48,7 @@ set-up a server connection and to send queries and view the results. %package plugin-framework -Summary: A dynamic component system for C++ +Summary: A dynamic component system for C++ %description plugin-framework The Common Toolkit is a community effort to provide support code for medical @@ -61,7 +62,7 @@ service oriented approach. %package widgets -Summary: A collection of Qt widgets for biomedical imaging applications +Summary: A collection of Qt widgets for biomedical imaging applications %description widgets The Common Toolkit is a community effort to provide support code for medical @@ -73,14 +74,14 @@ imaging applications. %package devel -Summary: Development files for the Common Toolkit +Summary: Development files for the Common Toolkit -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-dicom%{?_isa} = %{version}-%{release} -Requires: %{name}-plugin-framework%{?_isa} = %{version}-%{release} -Requires: %{name}-widgets%{?_isa} = %{version}-%{release} -Requires: cmake%{?_isa} -Requires: qt-devel%{?_isa} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-dicom%{?_isa} = %{version}-%{release} +Requires: %{name}-plugin-framework%{?_isa} = %{version}-%{release} +Requires: %{name}-widgets%{?_isa} = %{version}-%{release} +Requires: cmake%{?_isa} +Requires: qt-devel%{?_isa} %description devel The Common Toolkit is a community effort to provide support code for medical @@ -91,8 +92,8 @@ This package contains files for development of CTK applications. %package doc -Summary: Documentation for the Common Toolkit -BuildArch: noarch +Summary: Documentation for the Common Toolkit +BuildArch: noarch %description doc The Common Toolkit is a community effort to provide support code for medical @@ -102,12 +103,10 @@ This package contains CTK developer documentation. %prep -%autosetup -n CTK-%{commit} -p1 -mkdir build - +%autosetup -n CTK-2018-10-29 -p1 %build -pushd build +mkdir build && pushd build %cmake \ -DCMAKE_PREFIX_PATH=%{_libdir}/cmake/InsightToolkit \ -DCTK_SUPERBUILD=OFF \ @@ -119,7 +118,7 @@ pushd build -DCTK_ENABLE_PluginFramework=ON \ -DCTK_ENABLE_Widgets=ON \ -DDOCUMENTATION_TARGET_IN_ALL=OFF \ - .. + -DBUILD_TESTING:BOOL=OFF .. %make_build %make_build doc popd @@ -153,7 +152,6 @@ popd %files plugin-framework %{_libdir}/libCTKPluginFramework.so.* -%{_libdir}/libCTKDummyPlugin.so.* %files widgets %{_libdir}/libCTKWidgets.so.* @@ -165,12 +163,16 @@ popd %{_libdir}/cmake/%{name} %files doc +%license NOTICE LICENSE %doc build/Documentation/html %exclude %{_docdir}/%{name}/html/*.map %exclude %{_docdir}/%{name}/html/*.md5 %changelog +* Sat Mar 02 2019 Antonio Trande - 0.1-20181029.1 +- Release 2018 10 29 + * Thu Jan 31 2019 Fedora Release Engineering - 0.1-0.11.20171224git71799c2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index cab76e9..0b34810 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (CTK-71799c27da506c899f2ef04b50cd8d454374870d.tar.gz) = 6337fea44015db60f775ccbfa53a822a9b64283c07e09f9a2974466422eb8880b99b40dc538e7aae5518cd4f5e89b741e697810617e0eb37d8680ba72d0e0758 +SHA512 (CTK-2018-10-29.tar.gz) = a4204ba0639f89fef7a067978f107ceb6c115f888db70ead26dc092c6c5a8d7bd5b83ca8c3a28e9862980bbafbd7a9d45e0cfddb905c58596953ddb01242f5f5