From 7d6d0b1ca19a20597fb613c6e6ea958a8e328ba8 Mon Sep 17 00:00:00 2001
From: Mario Ceresa <mario.ceresa@alma3d.com>
Date: Tue, 13 Aug 2013 16:52:07 +0200
Subject: [PATCH] - Re-enabled vtk bindings - Added additional debug symbols -
 Added gdcmData source in order to run tests - Enabled testing (for now
 informational only) - Enabled build of gdcmd5 because its needed by tests -
 Re-added graphviz BR

---
 .gitignore |  2 ++
 gdcm.spec  | 27 +++++++++++++++++----------
 sources    |  1 +
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 25e0fd4..39f6f43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 /gdcm-2.0.18.tar.bz2
 /gdcm-2.2.3.tar.bz2
 /gdcm-2.2.4.tar.bz2
+/gdcmData.tar.bz2
+/gdcmData.tar.gz
diff --git a/gdcm.spec b/gdcm.spec
index 5c6e717..1506e42 100644
--- a/gdcm.spec
+++ b/gdcm.spec
@@ -12,9 +12,7 @@ Group:		Development/Libraries
 License:	BSD
 URL:		http://gdcm.sourceforge.net/wiki/index.php/Main_Page
 Source0:	http://sourceforge.net/projects/gdcm/files/gdcm%202.x/GDCM%20%{version}/%{name}-%{version}.tar.bz2
-#Source1:	http://downloads.sourceforge.net/project/gdcm/gdcmData/gdcmData/gdcmData.tar.bz2
-# There is a bug in doxygen preventing compilation on:
-#ExcludeArch:	ppc ppc64
+Source1:	http://downloads.sourceforge.net/project/gdcm/gdcmData/gdcmData/gdcmData.tar.gz
 
 Patch1:	gdcm-2.0.14-inplacebuild.patch
 Patch2:	gdcm-2.0.14-usecopyright.patch
@@ -28,7 +26,7 @@ BuildRequires:	cmake
 BuildRequires:	doxygen
 BuildRequires:	expat-devel
 BuildRequires:	fontconfig-devel
-#BuildRequires:	graphviz
+BuildRequires:	graphviz
 BuildRequires:	gl2ps-devel
 BuildRequires:	libogg-devel
 BuildRequires:	libtheora-devel
@@ -89,6 +87,7 @@ used this library with python
 
 %prep
 %setup -q
+%setup -T -D -a 1
 %patch1
 %patch2
 %patch3 -p 1
@@ -104,12 +103,14 @@ rm -rf Utilities/gdcmuuid
 rm -rf Utilities/gdcmcharls
 
 # Remove bundled utilities (we don't use them)
-rm -rf Utilities/gdcmmd5
 rm -rf Utilities/getopt
 rm -rf Utilities/pvrg
 rm -rf Utilities/rle
 rm -rf Utilities/wxWidgets
 
+# Needed for testing:
+#rm -rf Utilities/gdcmmd5 
+
 
 %build
 
@@ -119,7 +120,8 @@ pushd %{_target_platform}
 
 %cmake	.. \
 	-DCMAKE_VERBOSE_MAKEFILE=ON \
-	-DGDCM_BUILD_TESTING=OFF \
+	-DGDCM_BUILD_TESTING=ON \
+	-DGDCM_DATA_ROOT=../gdcmData/ \
 	-DGDCM_BUILD_EXAMPLES:BOOL=ON \
 	-DGDCM_DOCUMENTATION:BOOL=ON \
 	-DGDCM_PDF_DOCUMENTATION:BOOL=OFF \
@@ -127,7 +129,7 @@ pushd %{_target_platform}
 	-DGDCM_WRAP_JAVA=OFF \
 	-DGDCM_BUILD_SHARED_LIBS:BOOL=ON \
 	-DGDCM_BUILD_APPLICATIONS:BOOL=ON \
-	-DCMAKE_BUILD_TYPE:STRING="Release" \
+	-DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
 	-DGDCM_USE_VTK:BOOL=ON \
 	-DGDCM_USE_SYSTEM_CHARLS=ON \
 	-DGDCM_USE_SYSTEM_EXPAT=ON \
@@ -165,8 +167,9 @@ find %{_builddir}/%{?buildsubdir}/Examples -depth -name CMakeFiles | xargs rm -r
 find %{_builddir}/%{?buildsubdir}/Examples -depth -size 0 | xargs rm -rf
 
 %check
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/bin
-ctest .
+# Making the tests informative only for now. Several failing tests (27/228):
+# 11,40,48,49,107-109,111-114,130-135,146,149,,151-154,157,194,216,219
+make test -C %{_target_platform} || exit 0
 
 %post -p /sbin/ldconfig
 
@@ -196,8 +199,12 @@ ctest .
 %{python_sitelib}/*
 
 %changelog
-* Mon Aug 05 2013 Mario Ceresa <mrceresa AT fedoraproject DOT org> - 2.2.4-5
+* Tue Aug 13 2013 Mario Ceresa <mrceresa AT fedoraproject DOT org> - 2.2.4-5
 - Re-enabled vtk bindings
+- Added additional debug symbols
+- Enabled testing (for now informational only)
+- Enabled build of gdcmd5 because its needed by tests
+- Re-added graphviz BR 
 
 * Mon Aug 05 2013 Mario Ceresa <mrceresa AT fedoraproject DOT org> - 2.2.4-4
 - Fixed doc generation
diff --git a/sources b/sources
index c607998..4112982 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 d53e708f973efbe2f1c500cc7198b27e  gdcm-2.2.4.tar.bz2
+9e73255514b7406f365b615319ed9699  gdcmData.tar.gz