[orthanc] Orthanc 0.6.2 - for review
Sebastien Jodogne
sjodogne at fedoraproject.org
Fri Oct 11 15:18:24 UTC 2013
commit b178d592e9e8e3518a87e689748a3cff0706d444
Author: Sebastien Jodogne <s.jodogne at gmail.com>
Date: Fri Oct 11 17:18:11 2013 +0200
Orthanc 0.6.2 - for review
.gitignore | 1 +
liborthancclient.README | 18 +++++
...-0.6.1-cmake.patch => orthanc-0.6.2-cmake.patch | 22 ++++--
orthanc.spec | 77 +++++++++++++++++++-
sources | 2 +-
5 files changed, 110 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f3ca47b..5301bfc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/Orthanc-0.5.2.tar.gz
/Orthanc-0.6.0.tar.gz
/Orthanc-0.6.1.tar.gz
+/Orthanc-0.6.2.tar.gz
diff --git a/liborthancclient.README b/liborthancclient.README
new file mode 100644
index 0000000..ff49908
--- /dev/null
+++ b/liborthancclient.README
@@ -0,0 +1,18 @@
+The API documentation of the Orthanc Client can be opened using the
+following command:
+
+$ firefox file:///usr/share/doc/liborthancclient-0.6.2/OrthancClient/index.html
+
+The basic sample can be compiled with the following command:
+
+$ mkdir /tmp/OrthancClientSample
+$ cd /tmp/OrthancClientSample
+$ cmake /usr/share/doc/liborthancclient-0.6.2/Samples/Basic
+$ make
+$ ./Test
+
+Before running this basic sample, make sure that Orthanc is up and
+running on the default HTTP port. This can be checked by opening the
+Orthanc Web interface:
+
+$ firefox http://localhost:8042/app/explorer.html
diff --git a/orthanc-0.6.1-cmake.patch b/orthanc-0.6.2-cmake.patch
similarity index 51%
rename from orthanc-0.6.1-cmake.patch
rename to orthanc-0.6.2-cmake.patch
index b08704a..9f76bb5 100644
--- a/orthanc-0.6.1-cmake.patch
+++ b/orthanc-0.6.2-cmake.patch
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2013-09-16 15:47:15.112414675 +0200
-+++ CMakeLists.txt 2013-09-16 15:48:07.416416802 +0200
-@@ -188,14 +188,14 @@
+--- CMakeLists.txt.orig 2013-10-11 15:14:54.054896538 +0200
++++ CMakeLists.txt 2013-10-11 15:17:23.790892757 +0200
+@@ -224,7 +224,7 @@
install(
TARGETS Orthanc
@@ -8,7 +8,8 @@
+ RUNTIME DESTINATION sbin
)
- # Build the unit tests if required
+
+@@ -236,7 +236,7 @@
if (BUILD_UNIT_TESTS)
add_definitions(-DORTHANC_BUILD_UNIT_TESTS=1)
include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleTestConfiguration.cmake)
@@ -17,12 +18,21 @@
${GTEST_SOURCES}
UnitTests/FileStorage.cpp
UnitTests/MemoryCache.cpp
-@@ -209,7 +209,7 @@
+@@ -250,7 +250,7 @@
UnitTests/Lua.cpp
UnitTests/main.cpp
)
- target_link_libraries(UnitTests ServerLibrary CoreLibrary)
+ target_link_libraries(UnitTestsExecutable ServerLibrary CoreLibrary)
- endif()
+ if (${OPENSSL_SOURCES_LENGTH} GREATER 0)
+ target_link_libraries(UnitTests OpenSSL)
+@@ -337,6 +337,8 @@
+ message(FATAL_ERROR "Support your platform here")
+ endif()
++ set_target_properties(OrthancClient PROPERTIES VERSION 0.6 SOVERSION 0.6)
++
+ install(
+ TARGETS OrthancClient
+ RUNTIME DESTINATION lib # Destination for Windows
diff --git a/orthanc.spec b/orthanc.spec
index d5d7c42..269ad85 100644
--- a/orthanc.spec
+++ b/orthanc.spec
@@ -1,6 +1,9 @@
+%define orthancclientversion 0.6
+%define orthancversion 0.6.2
+
Name: orthanc
-Version: 0.6.1
-Release: 3%{?dist}
+Version: %{orthancversion}
+Release: 1%{?dist}
Summary: RESTful DICOM server for healthcare and medical research
License: GPLv3 with exceptions
@@ -8,12 +11,13 @@ URL: https://code.google.com/p/orthanc/
Source0: https://orthanc.googlecode.com/files/Orthanc-%{version}.tar.gz
Source1: orthanc.json
Source2: orthanc.service
+Source3: liborthancclient.README
# This patch fixes a problem with in-place builds that are currently
# not supported by the CMake script of Orthanc ("UnitTests" is at the
# same time the name of a source directory and of a generated
# executable).
-Patch1: orthanc-0.6.1-cmake.patch
+Patch1: orthanc-%{orthancversion}-cmake.patch
BuildRequires: cmake >= 2.8.0
BuildRequires: boost-devel
@@ -30,6 +34,7 @@ BuildRequires: openssl-devel
BuildRequires: python
BuildRequires: jsoncpp-devel
BuildRequires: lua-devel >= 5.1.0
+BuildRequires: doxygen
BuildRequires: systemd
# The following line is required to add the "orthanc" user and group
@@ -60,6 +65,42 @@ Orthanc lets its users focus on the content of the DICOM files,
hiding the complexity of the DICOM format and of the DICOM protocol.
+%package -n liborthancclient%{orthancclientversion}
+Summary: Orthanc Client library
+Group: System/Libraries
+
+%description -n liborthancclient%{orthancclientversion}
+Orthanc Client is a library to access the content of a remote instance
+of Orthanc. Orthanc is a lightweight, RESTful DICOM server for
+healthcare and medical research.
+
+%package -n liborthancclient-devel
+Summary: Header files for Orthanc Client library
+Group: Development/Libraries/C and C++
+Requires: liborthancclient%{orthancclientversion} = %{version}-%{release}
+Requires: cmake >= 2.8.0
+Requires: boost
+Requires: curl
+Requires: libpng
+Requires: openssl
+Requires: jsoncpp
+
+%description -n liborthancclient-devel
+This package contains the development and header files for the Orthanc
+Client library.
+
+
+%package -n liborthancclient-doc
+Summary: Documentation files for Orthanc Client library
+Group: Documentation
+BuildArch: noarch
+
+%description -n liborthancclient-doc
+This package contains the API document of the Orthanc Client library,
+and sample codes.
+
+
+
%prep
%setup -q -n Orthanc-%{version}
%patch1
@@ -67,6 +108,7 @@ hiding the complexity of the DICOM format and of the DICOM protocol.
# Copy the configuration file and the Systemd Service for the Orthanc server
cp -p %SOURCE1 orthanc.json
cp -p %SOURCE2 orthanc.service
+cp -p %SOURCE3 liborthancclient.README
%build
@@ -104,6 +146,15 @@ cp orthanc.service %{buildroot}%{_unitdir}
install -m 755 -d %{buildroot}%{_sharedstatedir}/orthanc/db-v3
+# Copy the Doxgen documentation of Orthanc Client
+mv %{buildroot}%{_docdir}/orthanc %{buildroot}%{_docdir}/liborthancclient-%{orthancversion}
+
+# README file for the Orthanc Client
+cp liborthancclient.README %{buildroot}%{_docdir}/liborthancclient-%{orthancversion}/README
+
+# Copy sample codes for the Orthanc Client
+cp -r Resources/Samples/OrthancClient %{buildroot}%{_docdir}/liborthancclient-%{orthancversion}/Samples
+
%files
%doc NEWS README THANKS COPYING
@@ -117,6 +168,22 @@ install -m 755 -d %{buildroot}%{_sharedstatedir}/orthanc/db-v3
%dir %attr(0755, orthanc, orthanc) %{_sharedstatedir}/orthanc/db-v3
+%files -n liborthancclient%{orthancclientversion}
+%defattr(-,root,root,-)
+%{_libdir}/*.so.*
+
+
+%files -n liborthancclient-devel
+%defattr(-,root,root,-)
+%{_includedir}/*
+%{_libdir}/*.so
+
+
+%files -n liborthancclient-doc
+%defattr(-,root,root,-)
+%{_docdir}/liborthancclient-%{orthancversion}/*
+
+
# Installation of the Systemd Orthanc service
# https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd
@@ -142,6 +209,10 @@ exit 0
%changelog
+* Fri Oct 11 2013 Sebastien Jodogne <s.jodogne at gmail.com> 0.6.2-1
+- New upstream version
+- Packaging of the Orthanc Client library
+
* Mon Sep 16 2013 Sebastien Jodogne <s.jodogne at gmail.com> 0.6.1-1
- New upstream version
diff --git a/sources b/sources
index 6e912e3..c36f76c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d312c06b183a214697f851b27dfd8fca Orthanc-0.6.1.tar.gz
+4ff6274bda5c0704d3975ef3e226910a Orthanc-0.6.2.tar.gz
More information about the scm-commits
mailing list