[orthanc: 2/2] Orthanc 0.5.2

[Sebastien Jodogne]

commit e1fec04989360ca276830587c86dcb49857bcf54
Author: Sebastien Jodogne <s.jodogne at gmail.com>
Date:   Wed May 8 13:09:29 2013 +0200

    Orthanc 0.5.2

 orthanc-0.5.2-initialization.patch |   21 +++++++++++++++++++++
 orthanc.spec                       |    4 +++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/orthanc-0.5.2-initialization.patch b/orthanc-0.5.2-initialization.patch
new file mode 100644
index 0000000..9b1de5e
--- /dev/null
+++ b/orthanc-0.5.2-initialization.patch
@@ -0,0 +1,21 @@
+--- OrthancServer/OrthancInitialization.cpp.orig	2013-05-08 12:52:30.479680659 +0200
++++ OrthancServer/OrthancInitialization.cpp	2013-05-08 12:52:56.811679993 +0200
+@@ -283,7 +283,17 @@
+   std::string InterpretStringParameterAsPath(const std::string& parameter)
+   {
+     boost::mutex::scoped_lock lock(globalMutex_);
+-    return (defaultDirectory_ / parameter).string();
++ 
++    boost::filesystem::path p(parameter);
++
++    if (p.is_absolute())
++    {
++      return p.string();
++    }
++    else
++    {
++      return (defaultDirectory_ / parameter).string();
++    }
+   }
+ 
+ 
diff --git a/orthanc.spec b/orthanc.spec
index 4b31a5f..29d70dd 100644
--- a/orthanc.spec
+++ b/orthanc.spec
@@ -18,8 +18,9 @@ Patch1:		orthanc-0.5.2-cmake.patch
 # This patch fixes a CMake error when dynamically linking against Lua
 Patch2:		orthanc-0.5.2-lua-cmake.patch
 
-# This patch fixes a problem in path resolution
+# The two following patches fix a problem in path resolution
 Patch3:		orthanc-0.5.2-main.patch
+Patch4:		orthanc-0.5.2-initialization.patch
 
 BuildRequires:	cmake >= 2.8.0
 BuildRequires:	boost-devel
@@ -70,6 +71,7 @@ hiding the complexity of the DICOM format and of the DICOM protocol.
 %patch1
 %patch2
 %patch3
+%patch4
 
 # Copy the configuration file and the Systemd Service for the Orthanc server
 cp -p %SOURCE1 orthanc.json