[InsightToolkit] Update to 4.6.0

[sebp]

commit 182273c1bd7379041defa747c51d22ad7187300d
Author: Sebastian Pölsterl <poelster at in.tum.de>
Date:   Sun Aug 3 22:19:44 2014 -0400

    Update to 4.6.0

 .gitignore          |    4 ++++
 InsightToolkit.spec |   19 +++++++++++++------
 sources             |    5 +++--
 3 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 11bfab6..873265b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,7 @@
 /InsightSoftwareGuide-4.5.0.pdf
 /InsightToolkit-4.5.1.tar.xz
 /InsightToolkit-4.5.2.tar.xz
+/InsightSphinxExamples-4.6.0.tar.xz
+/InsightSoftwareGuide-Book1-4.6.0.pdf
+/InsightSoftwareGuide-Book2-4.6.0.pdf
+/InsightToolkit-4.6.0.tar.xz
diff --git a/InsightToolkit.spec b/InsightToolkit.spec
index c3340c0..8d04122 100644
--- a/InsightToolkit.spec
+++ b/InsightToolkit.spec
@@ -1,6 +1,6 @@
 %define _ver_major      4
-%define _ver_minor      5
-%define _ver_release    2
+%define _ver_minor      6
+%define _ver_release    0
 
 %if 0%{?rhel} && 0%{?rhel} <= 5
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
@@ -10,11 +10,12 @@
 Name:           InsightToolkit
 Summary:        Insight Toolkit library for medical image processing
 Version:        %{_ver_major}.%{_ver_minor}.%{_ver_release}
-Release:        3%{?dist}
+Release:        1%{?dist}
 License:        ASL 2.0
 Group:          Applications/Engineering
 Source0:        http://sourceforge.net/projects/itk/files/itk/%{_ver_major}.%{_ver_minor}/%{name}-%{version}.tar.xz
-Source1:        http://downloads.sourceforge.net/project/itk/itk/4.5/InsightSoftwareGuide-4.5.0.pdf
+Source1:        http://downloads.sourceforge.net/project/itk/itk/4.6/InsightSoftwareGuide-Book1-4.6.0.pdf
+Source2:        http://downloads.sourceforge.net/project/itk/itk/4.6/InsightSoftwareGuide-Book2-4.6.0.pdf
 URL:            http://www.itk.org/
 Patch0:         %{name}-0001-Set-lib-lib64-according-to-the-architecture.patch
 #Patch1:         %{name}-Fix_HDF5_Libraries.patch
@@ -40,6 +41,7 @@ BuildRequires:  blas-devel
 BuildRequires:  lapack-devel
 BuildRequires:  netcdf-cxx-devel
 BuildRequires:  jsoncpp-devel
+BuildRequires:  expat-devel
 
 %description
 ITK is an open-source software toolkit for performing registration and 
@@ -109,7 +111,7 @@ Provides an interface between ITK and VTK
 #%patch1 -p1
 
 # copy guide into the appropriate directory
-cp -a %{SOURCE1} .
+cp -a %{SOURCE1} %{SOURCE2} .
 
 # remove applications: they are shipped separately now
 rm -rf Applications/
@@ -141,6 +143,7 @@ pushd %{_target_platform}
        -DITK_USE_SYSTEM_VXL=ON \
        -DITK_USE_SYSTEM_SWIG=ON \
        -DITK_USE_SYSTEM_GCCXML=ON \
+       -DITK_USE_SYSTEM_EXPAT=ON \
        -DITK_INSTALL_LIBRARY_DIR=%{_lib}/ \
        -DITK_INSTALL_INCLUDE_DIR=include/%{name} \
        -DITK_INSTALL_PACKAGE_DIR=%{_lib}/cmake/%{name}/ \
@@ -194,12 +197,16 @@ make test -C %{_target_platform} || exit 0
 %files doc
 %dir %{_docdir}/%{name}/
 %{_docdir}/%{name}/*
-%doc InsightSoftwareGuide-4.5.0.pdf
+%doc InsightSoftwareGuide-Book1-4.6.0.pdf
+%doc InsightSoftwareGuide-Book2-4.6.0.pdf
 
 %files vtk
 %{_libdir}/libITKVtkGlue*.so.*
 
 %changelog
+* Mon Aug 04 2014 Sebastian Pölsterl <sebp at k-d-w.org> - 4.6.0-1
+- Update to 4.6.0
+
 * Fri Jun 06 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.5.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 23c9e51..757b8bd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-897c7fa755c10504635743aae324cc52  InsightToolkit-4.5.2.tar.xz
-99a6008d02b25f7fdbdc80c1a2e4266f  InsightSoftwareGuide-4.5.0.pdf
+bd18f49599bb06092ea0aabad533010d  InsightToolkit-4.6.0.tar.xz
+112a82a8268bf3f979ffa435cdcd8476  InsightSoftwareGuide-Book1-4.6.0.pdf
+5a36f16f2e1dea1e923c60096e655c00  InsightSoftwareGuide-Book2-4.6.0.pdf