Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package orthanc for openSUSE:Factory checked in at 2022-10-28 19:32:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/orthanc (Old) and /work/SRC/openSUSE:Factory/.orthanc.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "orthanc" Fri Oct 28 19:32:00 2022 rev:24 rq:1031963 version:1.11.2 Changes: -------- --- /work/SRC/openSUSE:Factory/orthanc/orthanc.changes 2022-10-03 13:47:13.477674471 +0200 +++ /work/SRC/openSUSE:Factory/.orthanc.new.2275/orthanc.changes 2022-10-28 19:32:29.915524445 +0200 @@ -1,0 +2,7 @@ +Tue Oct 25 10:13:39 UTC 2022 - Axel Braun <axel.br...@gmx.de> + +- Build fixed for new plugins + cmake.diff added + install_cmd.diff added + +------------------------------------------------------------------- New: ---- cmake.diff install_cmd.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ orthanc.spec ++++++ --- /var/tmp/diff_new_pack.9Kqctn/_old 2022-10-28 19:32:30.555527655 +0200 +++ /var/tmp/diff_new_pack.9Kqctn/_new 2022-10-28 19:32:30.563527695 +0200 @@ -37,6 +37,8 @@ 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 @@ -123,6 +125,7 @@ %prep %setup -q -n Orthanc-%{version} +%autopatch -p1 cp %{S:1} %{S:2} . @@ -203,6 +206,10 @@ # remove the symbolic links generated by CMake mkdir -p %{buildroot}%{_libdir}/%{name} mv build/*.so.%{version} %{buildroot}%{_libdir}/%{name} +# libs since version 1.11.1 dont install in /usr/lib anymore, we need a workaround: +cp %{buildroot}%{_prefix}/share/%{name}/plugins/libConnectivityChecks.so.%{version} %{buildroot}%{_libdir}/%{name} +cp %{buildroot}%{_prefix}/share/%{name}/plugins/libDelayedDeletion.so.%{version} %{buildroot}%{_libdir}/%{name} + rm build/*.so # move the executables to stay consistent @@ -214,23 +221,22 @@ rm %{buildroot}%{_prefix}/share/%{name}/plugins/*.so* -ln -s ../../../..%{_libdir}/%{name}/libServeFolders.so.%{version} \ - %{buildroot}%{_prefix}/share/%{name}/plugins/libServeFolders.so -ln -s ../../../..%{_libdir}/%{name}/libModalityWorklists.so.%{version} \ - %{buildroot}%{_prefix}/share/%{name}/plugins/libModalityWorklists.so ln -s ../../../..%{_libdir}/%{name}/libConnectivityChecks.so.%{version} \ %{buildroot}%{_prefix}/share/%{name}/plugins/libConnectivityChecks.so ln -s ../../../..%{_libdir}/%{name}/libDelayedDeletion.so.%{version} \ %{buildroot}%{_prefix}/share/%{name}/plugins/libDelayedDeletion.so +ln -s ../../../..%{_libdir}/%{name}/libServeFolders.so.%{version} \ + %{buildroot}%{_prefix}/share/%{name}/plugins/libServeFolders.so +ln -s ../../../..%{_libdir}/%{name}/libModalityWorklists.so.%{version} \ + %{buildroot}%{_prefix}/share/%{name}/plugins/libModalityWorklists.so + + # Prepare documentation: "index.html", Doxygen of plugin SDK, and sample codes cp -r %{S:5} %{buildroot}%{_docdir}/%{name}/ cp -r OrthancServer/Resources/Samples/ %{buildroot}%{_docdir}/%{name}/Samples cp -r OrthancServer/Plugins/Samples/ %{buildroot}%{_docdir}/%{name}/OrthancPluginSamples -# some libs appear under buildroot/home...for whatever reason... -rm -rf %{buildroot}/home* - echo 'ldconfig -v | grep libcrypto.so' %pre ++++++ cmake.diff ++++++ # HG changeset patch # User Alain Mazy <a...@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() ++++++ install_cmd.diff ++++++ --- 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")
