2:16 p.m.
The package rpms/dcmtk.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/dcmtk.git/commit/?id=b5705f57bfe2....
Change:
+%ifarch ppc64le s390x
Thanks.
Full change:
============
commit b5705f57bfe290ee9ad7932cf52713d6d27b8636
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Mon Apr 25 20:15:08 2022 +0100
fix: disable sporadically failing test on s390x
diff --git a/dcmtk.spec b/dcmtk.spec
index 63f1805..aaf71a7 100644
--- a/dcmtk.spec
+++ b/dcmtk.spec
@@ -18,7 +18,7 @@ Version: 3.6.6
# https://github.com/DCMTK/dcmtk/blob/master/CMake/dcmtkPrepare.cmake#L78
%global soname_version %{abi_version}.%{version}
-Release: 10%{?dist}
+Release: 11%{?dist}
License: BSD
Source0: https://dicom.offis.de/download/dcmtk/dcmtk366/dcmtk-3.6.6.tar.gz
URL: http://dicom.offis.de/dcmtk.php.en
@@ -137,8 +137,8 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/wlistdb/OFFIS/lockfile
%ldconfig_scriptlets
%check
-# ppc64le: remove dcmtls_scp_tls and dcmtls_scp_pool_tls that sporadically fails
-%ifarch ppc64le
+# ppc64le, s390x: remove dcmtls_scp_tls and dcmtls_scp_pool_tls that sporadically fails
+%ifarch ppc64le s390x
rm -rf %{_vpath_builddir}/dcmtls/tests/
%endif
%ctest
@@ -244,6 +244,9 @@ rm -rf %{_vpath_builddir}/dcmtls/tests/
%{_libdir}/libofstd.so
%changelog
+* Mon Apr 25 2022 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 3.6.6-11
+- Disable sporadically failing test on s390x also
+
* Mon Apr 25 2022 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 3.6.6-10
- Use bundled charls
commit d9cff801c2e4e2928e247a8c973b7118ec589ed5
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Mon Apr 25 17:38:09 2022 +0100
fix: use bundled charls v1
Charls v2 includes regressions. Debian has also resorted to using
bundled v1 for the time being, until upstream ports to v2.
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923433
diff --git a/dcmtk.spec b/dcmtk.spec
index 1c91777..63f1805 100644
--- a/dcmtk.spec
+++ b/dcmtk.spec
@@ -8,6 +8,8 @@
%global abi_version 16
+%bcond_with charls2
+
Name: dcmtk
Summary: Offis DICOM Toolkit (DCMTK)
Version: 3.6.6
@@ -16,11 +18,15 @@ Version: 3.6.6
# https://github.com/DCMTK/dcmtk/blob/master/CMake/dcmtkPrepare.cmake#L78
%global soname_version %{abi_version}.%{version}
-Release: 9%{?dist}
+Release: 10%{?dist}
License: BSD
Source0: https://dicom.offis.de/download/dcmtk/dcmtk366/dcmtk-3.6.6.tar.gz
URL: http://dicom.offis.de/dcmtk.php.en
+# Use bundled charls version and wait until upstream ports to new charls version
+# charls version 2 includes a regression:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923433
+%if %{with charls2}
+# not merged upstream yet: https://github.com/DCMTK/dcmtk/pull/18
Patch0: 0001-3.6.4-Use-system-CharLS-include.patch
Patch1: 0002-3.6.4-Add-FindCharLS.patch
Patch2: 0003-3.6.6-Find-and-include-CharLS.patch
@@ -37,6 +43,7 @@ Patch12:
0013-3.6.4-Update-errors-to-use-enum-class-in-CharLS-2.patch
Patch13: 0014-3.6.4-define-BYTE-for-CharLS.patch
Patch14: 0015-3.6.6-Update-colorTransformation-for-CharLS-2.patch
Patch15: 0016-3.6.4-Update-JpegLsEncode-for-CharLS-2.patch
+%endif
# https://forum.dcmtk.org/viewtopic.php?t=5084
Patch16: 0017-3.6.6-Increased-sleep-fraction-for-dcmtls_scp_pool_tls-test.patch
# Fix for endianess systems https://forum.dcmtk.org/viewtopic.php?f=3&t=5116
@@ -52,7 +59,9 @@ BuildRequires: libtiff-devel
BuildRequires: libxml2-devel
BuildRequires: openssl-devel >= 1.0.1
BuildRequires: zlib-devel
+%if %{with charls2}
BuildRequires: CharLS-devel >= 2.0.0
+%endif
BuildRequires: doxygen
%description
@@ -70,7 +79,9 @@ Install DCMTK if you are working with DICOM format medical image files.
%package devel
Summary: Development Libraries and Headers for dcmtk
Requires: %{name}%{?_isa} = %{version}-%{release}
+%if %{with charls2}
Requires: CharLS-devel%{?_isa}
+%endif
Requires: libpng-devel%{?_isa}
Requires: libtiff-devel%{?_isa}
@@ -81,8 +92,10 @@ this if you are developing programs that use the dcmtk libraries.
%prep
%autosetup -n %{name}-%{version} -p1 -S git
+%if %{with charls2}
# Remove bundled libraries
rm -rf dcmjpls/libcharls/
+%endif
# Fix permissions
find . -type f -name "*.h" -exec chmod 0644 '{}' \;
@@ -168,6 +181,8 @@ rm -rf %{_vpath_builddir}/dcmtls/tests/
%{_libdir}/libdcmseg.so.%{soname_version}
%{_libdir}/libdcmsr.so.%{abi_version}
%{_libdir}/libdcmsr.so.%{soname_version}
+%{_libdir}/libdcmtkcharls.so.%{abi_version}
+%{_libdir}/libdcmtkcharls.so.%{soname_version}
%{_libdir}/libdcmtls.so.%{abi_version}
%{_libdir}/libdcmtls.so.%{soname_version}
%{_libdir}/libdcmtract.so.%{abi_version}
@@ -218,6 +233,7 @@ rm -rf %{_vpath_builddir}/dcmtls/tests/
%{_libdir}/libdcmrt.so
%{_libdir}/libdcmseg.so
%{_libdir}/libdcmsr.so
+%{_libdir}/libdcmtkcharls.so
%{_libdir}/libdcmtls.so
%{_libdir}/libdcmtract.so
%{_libdir}/libdcmwlm.so
@@ -228,6 +244,9 @@ rm -rf %{_vpath_builddir}/dcmtls/tests/
%{_libdir}/libofstd.so
%changelog
+* Mon Apr 25 2022 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 3.6.6-10
+- Use bundled charls
+
* Mon Apr 25 2022 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 3.6.6-9
- Temporarily allow use of deprecated flags to fix build with openssl 3.0
commit 6fa46e144d9ee62f64551b4ed23363c69abcf811
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Mon Apr 25 17:03:58 2022 +0100
fix: allow using deprecated openssl declarations (fixes rhbz#2018915)
diff --git a/dcmtk.spec b/dcmtk.spec
index c876d5f..1c91777 100644
--- a/dcmtk.spec
+++ b/dcmtk.spec
@@ -16,7 +16,7 @@ Version: 3.6.6
# https://github.com/DCMTK/dcmtk/blob/master/CMake/dcmtkPrepare.cmake#L78
%global soname_version %{abi_version}.%{version}
-Release: 8%{?dist}
+Release: 9%{?dist}
License: BSD
Source0: https://dicom.offis.de/download/dcmtk/dcmtk366/dcmtk-3.6.6.tar.gz
URL: http://dicom.offis.de/dcmtk.php.en
@@ -89,8 +89,8 @@ find . -type f -name "*.h" -exec chmod 0644 '{}' \;
find . -type f -name "*.cc" -exec chmod 0644 '{}' \;
%build
-export CFLAGS="%{optflags} -fPIC"
-export CXXFLAGS="%{optflags} -fPIC"
+export CFLAGS="%{optflags} -fPIC -Wno-error=deprecated-declarations"
+export CXXFLAGS="%{optflags} -fPIC -Wno-error=deprecated-declarations"
export LDFLAGS="%{__global_ldflags} -fPIC"
%cmake -DCMAKE_BUILD_TYPE:STRING="Release" \
-DDCMTK_INSTALL_LIBDIR=%{_lib} \
@@ -111,7 +111,8 @@ export LDFLAGS="%{__global_ldflags} -fPIC"
-DDCMTK_WITH_XML:BOOL=ON \
-DDCMTK_WITH_CHARLS:BOOL=ON \
-DDCMTK_WITH_ZLIB:BOOL=ON \
- -DDCMTK_ENABLE_CXX11:BOOL=ON .
+ -DDCMTK_ENABLE_CXX11:BOOL=ON \
+ -Wno-dev
%cmake_build
%install
@@ -227,6 +228,9 @@ rm -rf %{_vpath_builddir}/dcmtls/tests/
%{_libdir}/libofstd.so
%changelog
+* Mon Apr 25 2022 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 3.6.6-9
+- Temporarily allow use of deprecated flags to fix build with openssl 3.0
+
* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.6.6-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild