From 20fbaf99704ba993161b228999d10b1e45af5e1ad8b196c1404242584d25e499 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Tue, 19 Mar 2024 11:10:07 +0000 Subject: [PATCH 1/2] Accepting request 1159309 from home:DocB:Orthanc updated build info OBS-URL: https://build.opensuse.org/request/show/1159309 OBS-URL: https://build.opensuse.org/package/show/graphics/orthanc?expand=0&rev=70 --- orthanc.changes | 5 +++++ orthanc.spec | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/orthanc.changes b/orthanc.changes index a3e035a..615f8ce 100644 --- a/orthanc.changes +++ b/orthanc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 19 08:23:12 UTC 2024 - Axel Braun + +- apply dcmtk patch to install section + ------------------------------------------------------------------- Thu Mar 7 20:21:58 UTC 2024 - Axel Braun diff --git a/orthanc.spec b/orthanc.spec index 0c0b4fb..8db6324 100644 --- a/orthanc.spec +++ b/orthanc.spec @@ -45,7 +45,7 @@ BuildRequires: curl-devel BuildRequires: dcmtk BuildRequires: dcmtk-devel BuildRequires: doxygen -%if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150500 +%if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150200 BuildRequires: gcc13-c++ %else BuildRequires: gcc-c++ @@ -144,7 +144,7 @@ mkdir -p OrthancServer/ThirdPartyDownloads cp %{S:10} %{S:11} %{S:12} %{S:13} OrthancServer/ThirdPartyDownloads/. %build -%if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150500 +%if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150200 export CC=gcc-13 export CXX=g++-13 %endif @@ -187,6 +187,9 @@ mkdir -p -m 755 %{buildroot}%{_docdir}/%{name} mkdir -p -m 755 %{buildroot}/usr/src/%{name} # Copy sources tar --strip-components 1 -xzf %{S:0} -C %{buildroot}/usr/src/%{name}/ +#Apply dcmtk patch +patch %{buildroot}/usr/src/%{name}/OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake < %{P:0} + # Do not mark Python scripts as executable find %{buildroot}/usr/src/%{name} -name '*.py' -exec chmod a-x "{}" + #...and delete dot files From 48bf42c765e8f65e6a509fea1eba3c5e9885106716fdc2410c9ac0291396ec9b Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Tue, 19 Mar 2024 15:38:10 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/graphics/orthanc?expand=0&rev=71 --- orthanc.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/orthanc.changes b/orthanc.changes index 615f8ce..ff2e282 100644 --- a/orthanc.changes +++ b/orthanc.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Tue Mar 19 08:23:12 UTC 2024 - Axel Braun -- apply dcmtk patch to install section +- apply dcmtk patch to install section: we need this patch in the source + RPM as well for the plugins, otherwise TW and Leap 15.6 fail to build plugins ------------------------------------------------------------------- Thu Mar 7 20:21:58 UTC 2024 - Axel Braun