diff --git a/Orthanc-1.12.1.tar.gz b/Orthanc-1.12.1.tar.gz deleted file mode 100644 index 7378298..0000000 --- a/Orthanc-1.12.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2e8bfe1f56a4cf9a281eb3975549122ee13f2f4057279d88bb0dd09b006e6189 -size 1991159 diff --git a/Orthanc-1.12.2.tar.gz b/Orthanc-1.12.2.tar.gz new file mode 100644 index 0000000..1100f16 --- /dev/null +++ b/Orthanc-1.12.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3bd15c539314e63c626a94ef803c2f1f2b830b875149d055319b4380bbb8b596 +size 2007463 diff --git a/libboost.diff b/libboost.diff deleted file mode 100644 index 226594a..0000000 --- a/libboost.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- a/OrthancFramework/Sources/Images/Font.cpp Mon Dec 18 09:52:12 2023 +0100 -+++ b/OrthancFramework/Sources/Images/Font.cpp Mon Dec 18 10:44:11 2023 +0100 -@@ -37,6 +37,7 @@ - #include "Image.h" - #include "ImageProcessing.h" - -+#include - #include - #include - #include - ---- a/OrthancFramework/Sources/Images/PamWriter.cpp Mon Dec 18 09:52:12 2023 +0100 -+++ b/OrthancFramework/Sources/Images/PamWriter.cpp Mon Dec 18 10:44:11 2023 +0100 -@@ -28,6 +28,7 @@ - #include "../OrthancException.h" - #include "../Toolbox.h" - -+#include - #include - - ---- a/OrthancServer/Sources/Search/ISqlLookupFormatter.cpp Mon Dec 18 09:52:12 2023 +0100 -+++ b/OrthancServer/Sources/Search/ISqlLookupFormatter.cpp Mon Dec 18 10:44:11 2023 +0100 -@@ -38,6 +38,7 @@ - - #include "DatabaseConstraint.h" - -+#include - #include - #include - diff --git a/orthanc.changes b/orthanc.changes index ee4fc3e..6a6f8b0 100644 --- a/orthanc.changes +++ b/orthanc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 21 09:13:15 UTC 2023 - Axel Braun + +- version 1.12.2 - see NEWS for full changelog + libboost.diff removed (included in source) + ------------------------------------------------------------------- Mon Dec 18 14:13:12 UTC 2023 - Axel Braun diff --git a/orthanc.spec b/orthanc.spec index 13def77..bbaacce 100644 --- a/orthanc.spec +++ b/orthanc.spec @@ -1,7 +1,7 @@ # # spec file for package orthanc # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2019-2023 Dr. Axel Braun # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: orthanc -Version: 1.12.1 +Version: 1.12.2 Release: 0 Summary: RESTful DICOM server for healthcare and medical research License: GPL-3.0-or-later @@ -38,7 +38,7 @@ Source11: https://orthanc.osimis.io/ThirdPartyDownloads/dicom-web/axios-0. 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: libboost.diff +## Patch0: libboost.diff BuildRequires: civetweb-devel BuildRequires: cmake >= 2.8.0 BuildRequires: curl-devel @@ -47,7 +47,6 @@ 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 @@ -57,6 +56,7 @@ BuildRequires: libboost_locale-devel >= 1.66 BuildRequires: libboost_regex-devel >= 1.66 BuildRequires: libboost_system-devel >= 1.66 BuildRequires: libboost_thread-devel >= 1.66 +BuildRequires: protobuf-devel #Workaround for boo#1180359 BuildRequires: libbz2-devel BuildRequires: libjpeg-devel @@ -125,7 +125,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} . @@ -231,7 +231,6 @@ ln -s ../../../..%{_libdir}/%{name}/libServeFolders.so.%{version} \ 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