Hello community, here is the log from the commit of package orthanc-wsi for openSUSE:Factory checked in at 2020-04-22 20:50:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/orthanc-wsi (Old) and /work/SRC/openSUSE:Factory/.orthanc-wsi.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "orthanc-wsi" Wed Apr 22 20:50:50 2020 rev:2 rq:795516 version:0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/orthanc-wsi/orthanc-wsi.changes 2019-12-14 12:23:25.759198867 +0100 +++ /work/SRC/openSUSE:Factory/.orthanc-wsi.new.2738/orthanc-wsi.changes 2020-04-22 20:51:04.503167021 +0200 @@ -1,0 +2,7 @@ +Sun Apr 19 07:06:11 UTC 2020 - Axel Braun <[email protected]> + +- orthanc 1.6.0 breaks build of this plugin. + inclusion of Orthanc 1.5.2 source and adaption of build options + wsi.json removed (plugin definition moved to Configuration.json) + +------------------------------------------------------------------- Old: ---- wsi.json New: ---- Orthanc-1.5.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ orthanc-wsi.spec ++++++ --- /var/tmp/diff_new_pack.RSIaga/_old 2020-04-22 20:51:05.835169629 +0200 +++ /var/tmp/diff_new_pack.RSIaga/_new 2020-04-22 20:51:05.835169629 +0200 @@ -1,8 +1,8 @@ # # spec file for package orthanc-wsi # -# Copyright (c) 2019 SUSE LLC -# Copyright (c) 2019 Dr. Axel Braun +# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2019-2020 Dr. Axel Braun # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -13,25 +13,26 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: orthanc-wsi Summary: Whole Slide Imaging for Orthanc License: AGPL-3.0-or-later Group: Productivity/Graphics/Viewers Version: 0.6 Release: 0 -Url: https://orthanc-server.com +URL: https://orthanc-server.com Source0: https://www.orthanc-server.com/downloads/get.php?path=/whole-slide-imaging/OrthancWSI-%{version}.tar.gz Source1: openlayers-3.19.0-dist.zip +Source2: http://www.orthanc-server.com/downloads/get.php?path=/orthanc/Orthanc-1.5.2.tar.gz Source11: orthanc-wsi-readme.SUSE -Source12: wsi.json BuildRequires: cmake +BuildRequires: curl-devel BuildRequires: dcmtk BuildRequires: dcmtk-devel BuildRequires: gcc-c++ -BuildRequires: curl-devel BuildRequires: jsoncpp-devel BuildRequires: libboost_date_time-devel >= 1.66 BuildRequires: libboost_filesystem-devel >= 1.66 @@ -40,11 +41,11 @@ BuildRequires: libboost_regex-devel >= 1.66 BuildRequires: libboost_system-devel >= 1.66 BuildRequires: libboost_thread-devel >= 1.66 -BuildRequires: libuuid-devel BuildRequires: libicu-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel +BuildRequires: libuuid-devel # Check was missing: BuildRequires: libxml2-devel BuildRequires: tcpd-devel @@ -52,12 +53,12 @@ BuildRequires: openjpeg2-devel BuildRequires: openssl-devel BuildRequires: orthanc-devel -BuildRequires: orthanc-source +##uildRequires: orthanc-source BuildRequires: unzip Requires: orthanc -BuildRoot: OrthancWSI-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The Orthanc project provides three official tools to support DICOM for whole-slide microscopic imaging (WSI): @@ -70,9 +71,12 @@ #OrthanPlugin may ask for additional files to be loaded #Putting them into this folder prevents download of sources from the web -cd ViewerPlugin -mkdir ThirdPartyDownloads -cp %{S:1} ThirdPartyDownloads/. + +mkdir ViewerPlugin/ThirdPartyDownloads +cp %{S:1} ViewerPlugin/ThirdPartyDownloads/. + +mkdir Applications/ThirdPartyDownloads +cp %{S:2} Applications/ThirdPartyDownloads/. %build # build the applications @@ -81,9 +85,9 @@ %cmake .. \ -DALLOW_DOWNLOADS=OFF \ -DUSE_SYSTEM_ORTHANC_SDK=ON \ - -DORTHANC_FRAMEWORK_SOURCE=path \ + -DORTHANC_FRAMEWORK_SOURCE=web \ -DBoost_NO_BOOST_CMAKE=ON \ - -DORTHANC_FRAMEWORK_ROOT=/usr/src/orthanc/ \ + -DORTHANC_FRAMEWORK_ROOT=ThirdPartyDownloads/ \ -DLIB_INSTALL_DIR=%{_libdir}/share/orthanc/plugins/ %cmake_build %{?_smp_mflags} @@ -96,7 +100,7 @@ -DUSE_SYSTEM_ORTHANC_SDK=ON \ -DORTHANC_FRAMEWORK_SOURCE=path \ -DBoost_NO_BOOST_CMAKE=ON \ - -DORTHANC_FRAMEWORK_ROOT=/usr/src/orthanc/ \ + -DORTHANC_FRAMEWORK_ROOT=%{_builddir}/OrthancWSI-0.6/Applications/build/Orthanc-1.5.2 \ -DLIB_INSTALL_DIR=%{_libdir}/share/orthanc/plugins/ %cmake_build %{?_smp_mflags} @@ -120,7 +124,7 @@ rm %{buildroot}%{_libdir}/share/orthanc/plugins/*.so -cp %{S:11} %{S:12} %{buildroot}%{_docdir}/orthanc/. +cp %{S:11} %{buildroot}%{_docdir}/orthanc/. %post -p /sbin/ldconfig ++++++ orthanc-wsi-readme.SUSE ++++++ --- /var/tmp/diff_new_pack.RSIaga/_old 2020-04-22 20:51:05.979169910 +0200 +++ /var/tmp/diff_new_pack.RSIaga/_new 2020-04-22 20:51:05.983169919 +0200 @@ -10,13 +10,9 @@ You may use /usr/share/doc/packages/orthanc/wsi.json as template and copy it to /etc/orthanc. You need to restart the Orthanc-Server to enable the configuration. -Note: If you have multiple plugins installed, make sure you have the line - -"Plugins" : [ - "/usr/share/orthanc/plugins/" - ], - -only ONCE in all .json files! +Note: The plugin is installed to +"/usr/share/orthanc/plugins/" +an this is globally defined in /etc/orthanc/Configuration.json For the command line tools, run
