rpm/orthanc
SHA256
1
0
Fork 0
forked from pool/orthanc
Code Pull Requests Activity

Accepting request 1080081 from home:DocB:Orthanc

Browse Source 
version 1.12.0

OBS-URL: https://build.opensuse.org/request/show/1080081
OBS-URL: https://build.opensuse.org/package/show/graphics/orthanc?expand=0&rev=53
This commit is contained in:
Axel Braun 2023-04-18 09:11:15 +00:00 committed by Git OBS Bridge
parent e3d1a015ea
commit 8db63b011a
7 changed files with 26 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Orthanc-1.11.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fd3a855f181db25db1baa9f94b2841b611dc623fb01c559f55be88502c6784a7
size 1920624

3
Orthanc-1.12.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5a18b0104be494e5d3bda326b3fc6c2c069afc8f6df94a5f840e4ccc9ece780c
size 1975136

32
cmake.diff
View File

@ -1,32 +0,0 @@
# HG changeset patch
# User Alain Mazy <am@osimis.io>
# Date 1665994164 -7200
# Node ID 3b1ae7a81d9b25136e21bced48410b7ebeb5c2df
# Parent c94c1e08340e0a6c7c51a9928a263eb7a314ed4b
fix install steps for ConnectivityChecks and DelayedDeletion plugins
diff -r c94c1e08340e -r 3b1ae7a81d9b OrthancServer/CMakeLists.txt
--- a/OrthancServer/CMakeLists.txt Mon Oct 10 10:27:09 2022 +0200
+++ b/OrthancServer/CMakeLists.txt Mon Oct 17 10:09:24 2022 +0200
@@ -609,8 +609,8 @@
list(GET CMAKE_FIND_LIBRARY_PREFIXES 0 Prefix)
list(GET CMAKE_FIND_LIBRARY_SUFFIXES 0 Suffix)
install(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/${Prefix}ConnectivityChecks${Suffix}
- ${CMAKE_CURRENT_BINARY_DIR}/${Prefix}ConnectivityChecks${Suffix}.${ORTHANC_VERSION}
+ ${CMAKE_CURRENT_BINARY_DIR}/ConnectivityChecks-build/${Prefix}ConnectivityChecks${Suffix}
+ ${CMAKE_CURRENT_BINARY_DIR}/ConnectivityChecks-build/${Prefix}ConnectivityChecks${Suffix}.${ORTHANC_VERSION}
DESTINATION "share/orthanc/plugins")
endif()
endif()
@@ -682,8 +682,8 @@
list(GET CMAKE_FIND_LIBRARY_PREFIXES 0 Prefix)
list(GET CMAKE_FIND_LIBRARY_SUFFIXES 0 Suffix)
install(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/${Prefix}DelayedDeletion${Suffix}
- ${CMAKE_CURRENT_BINARY_DIR}/${Prefix}DelayedDeletion${Suffix}.${ORTHANC_VERSION}
+ ${CMAKE_CURRENT_BINARY_DIR}/DelayedDeletion-build/${Prefix}DelayedDeletion${Suffix}
+ ${CMAKE_CURRENT_BINARY_DIR}/DelayedDeletion-build/${Prefix}DelayedDeletion${Suffix}.${ORTHANC_VERSION}
DESTINATION "share/orthanc/plugins")
endif()
endif()

20
install_cmd.diff
View File

@ -1,20 +0,0 @@
--- a/OrthancServer/CMakeLists.txt Wed Aug 31 10:21:35 2022 +0200
+++ b/OrthancServer/CMakeLists.txt Mon Oct 03 09:52:04 2022 +0200
@@ -591,6 +591,8 @@
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+
+ INSTALL_COMMAND ""
)
if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
@@ -662,6 +664,8 @@
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+
+ INSTALL_COMMAND ""
)
if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")

0
orthanc Normal file
View File

16
orthanc.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Sun Apr 16 19:52:25 UTC 2023 - Axel Braun <axel.braun@gmx.de>
- version 1.12.0
* Support for labels associated with patients, studies, series, and instances
* Added a sample plugin bringing multitenant DICOM support through labels
* Many other fixes and improvements, see NEWS
-------------------------------------------------------------------
Fri Apr 14 17:08:47 UTC 2023 - Axel Braun <axel.braun@gmx.de>
- version 1.11.3
* cmake.diff removed (included in source)
* install_cmd.diff removed (included in source)
* Many improvements, for detailed log see NEWS
-------------------------------------------------------------------
Tue Oct 25 10:13:39 UTC 2022 - Axel Braun <axel.braun@gmx.de>

15
orthanc.spec
View File

@ -2,7 +2,7 @@
# spec file for package orthanc
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2019-2022 Dr. Axel Braun
# Copyright (c) 2019-2023 Dr. Axel Braun
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
Name: orthanc
Version: 1.11.2
Version: 1.12.0
Release: 0
Summary: RESTful DICOM server for healthcare and medical research
License: GPL-3.0-or-later
@ -37,8 +37,6 @@ Source10: https://orthanc.osimis.io/ThirdPartyDownloads/dicom-web/bootstra
Source11: https://orthanc.osimis.io/ThirdPartyDownloads/dicom-web/axios-0.19.0.tar.gz
Source12: https://orthanc.osimis.io/ThirdPartyDownloads/jquery-3.4.1.min.js
Source13: https://orthanc.osimis.io/ThirdPartyDownloads/dicom-web/vuejs-2.6.10.tar.gz
Patch0: install_cmd.diff
Patch1: cmake.diff
BuildRequires: civetweb-devel
BuildRequires: cmake >= 2.8.0
@ -48,6 +46,7 @@ BuildRequires: dcmtk-devel
BuildRequires: doxygen
BuildRequires: gcc-c++
BuildRequires: googletest-devel
BuildRequires: protobuf-devel
BuildRequires: help2man
BuildRequires: jsoncpp-devel
BuildRequires: libboost_date_time-devel >= 1.66
@ -125,7 +124,7 @@ This package includes the source files for Orthanc. Use it in conjunction with t
%prep
%setup -q -n Orthanc-%{version}
%autopatch -p1
## %autopatch -p1
cp %{S:1} %{S:2} .
@ -134,8 +133,8 @@ cp %{S:8} OrthancServer/Resources/.
#OrthancPlugins may ask for additional files to be loaded
#Putting them into this folder prevents download of sources from the web
mkdir -p OrthancServer/Plugins/Samples/ConnectivityChecks/ThirdPartyDownloads
cp %{S:10} %{S:11} %{S:12} %{S:13} OrthancServer/Plugins/Samples/ConnectivityChecks/ThirdPartyDownloads/.
mkdir -p OrthancServer/ThirdPartyDownloads
cp %{S:10} %{S:11} %{S:12} %{S:13} OrthancServer/ThirdPartyDownloads/.
%build
%cmake ../OrthancServer \
@ -144,7 +143,7 @@ cp %{S:10} %{S:11} %{S:12} %{S:13} OrthancServer/Plugins/Samples/ConnectivityChe
-DENABLE_CIVETWEB=ON \
-DORTHANC_UNIT_TESTS_LINK_FRAMEWORK=OFF \
-DUSE_SYSTEM_MONGOOSE=OFF \
-DSYSTEM_MONGOOSE_USE_CALLBACKS=OFF \
-DSYSTEM_MONGOOSE_USE_CA/var/tmp/build-root/openSUSE_Tumbleweed-x86_64LLBACKS=OFF \
-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=OFF \
-DBoost_NO_BOOST_CMAKE=ON