Accepting request 1159614 from graphics

- 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

OBS-URL: https://build.opensuse.org/request/show/1159614
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/orthanc?expand=0&rev=32
This commit is contained in:
Dominique Leuenberger 2024-03-20 20:15:06 +00:00 committed by Git OBS Bridge
commit e1ab88c47a
2 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Mar 19 08:23:12 UTC 2024 - Axel Braun <axel.braun@gmx.de>
- 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 <axel.braun@gmx.de> Thu Mar 7 20:21:58 UTC 2024 - Axel Braun <axel.braun@gmx.de>

View File

@ -45,7 +45,7 @@ BuildRequires: curl-devel
BuildRequires: dcmtk BuildRequires: dcmtk
BuildRequires: dcmtk-devel BuildRequires: dcmtk-devel
BuildRequires: doxygen BuildRequires: doxygen
%if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150500 %if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150200
BuildRequires: gcc13-c++ BuildRequires: gcc13-c++
%else %else
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -144,7 +144,7 @@ mkdir -p OrthancServer/ThirdPartyDownloads
cp %{S:10} %{S:11} %{S:12} %{S:13} OrthancServer/ThirdPartyDownloads/. cp %{S:10} %{S:11} %{S:12} %{S:13} OrthancServer/ThirdPartyDownloads/.
%build %build
%if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150500 %if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150200
export CC=gcc-13 export CC=gcc-13
export CXX=g++-13 export CXX=g++-13
%endif %endif
@ -187,6 +187,9 @@ mkdir -p -m 755 %{buildroot}%{_docdir}/%{name}
mkdir -p -m 755 %{buildroot}/usr/src/%{name} mkdir -p -m 755 %{buildroot}/usr/src/%{name}
# Copy sources # Copy sources
tar --strip-components 1 -xzf %{S:0} -C %{buildroot}/usr/src/%{name}/ 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 # Do not mark Python scripts as executable
find %{buildroot}/usr/src/%{name} -name '*.py' -exec chmod a-x "{}" + find %{buildroot}/usr/src/%{name} -name '*.py' -exec chmod a-x "{}" +
#...and delete dot files #...and delete dot files