[gdcm] Update to 2.0.18 Drop upstreamed patches Add -DGDCM_USE_SYSTEM_CHARLS=ON

[Orion Poplawski]

commit 24032edaf0055b733ccff9037e83206cbae936ab
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Nov 2 08:25:37 2011 -0600

    Update to 2.0.18
    Drop upstreamed patches
    Add -DGDCM_USE_SYSTEM_CHARLS=ON

 FindCharLS.cmake                  |   34 ------------
 gdcm-2.0.16-JlsParameters.patch   |   58 ---------------------
 gdcm-2.0.16-fix-decode.patch      |   22 --------
 gdcm-2.0.16-fix_ptrdiff.patch     |   12 ----
 gdcm-2.0.16-remove-stdafx.patch   |   13 -----
 gdcm-2.0.17-use_openjpeg_1x.patch |   83 ------------------------------
 gdcm-2.0.17-use_system_charls     |  102 -------------------------------------
 gdcm.spec                         |   28 ++++-------
 8 files changed, 10 insertions(+), 342 deletions(-)
---
diff --git a/gdcm.spec b/gdcm.spec
index 58c7b9f..7a6cebe 100644
--- a/gdcm.spec
+++ b/gdcm.spec
@@ -5,27 +5,20 @@
 }
 
 Name:		gdcm
-Version:	2.0.17
-Release:	9%{?dist}
+Version:	2.0.18
+Release:	1%{?dist}
 Summary:	Grassroots DiCoM is a C++ library to parse DICOM medical files
 Group:		Development/Libraries
 License:	BSD
 URL:		http://sourceforge.net/apps/mediawiki/gdcm/index.php?title=Main_Page
-Source0:	http://sourceforge.net/projects/gdcm/files/gdcm%202.x/GDCM%202.0.17/gdcm-2.0.17.tar.bz2
+Source0:	http://sourceforge.net/projects/gdcm/files/gdcm%202.x/GDCM%20%{version}/gdcm-%{version}.tar.bz2
 #Source1:	http://downloads.sourceforge.net/project/gdcm/gdcmData/gdcmData/gdcmData.tar.bz2
-Source2:	FindCharLS.cmake
 # There is a bug in doxygen preventing compilation on:
 ExcludeArch:	ppc ppc64
 
 Patch1: gdcm-2.0.14-inplacebuild.patch
 Patch2:	gdcm-2.0.14-usecopyright.patch
-Patch3: gdcm-2.0.16-fix_ptrdiff.patch
-Patch4: gdcm-2.0.16-fix-decode.patch
-Patch5: gdcm-2.0.16-JlsParameters.patch
 Patch6: gdcm-2.0.17-install2libarch.patch
-Patch7: gdcm-2.0.17-use_openjpeg_1x.patch
-Patch8: gdcm-2.0.17-use_system_charls
-Patch9: gdcm-2.0.16-remove-stdafx.patch
 Patch10: gdcm-2.0.17-no_versioned_dir.patch
 
 BuildRequires:	cmake >= 2.6.0
@@ -84,13 +77,7 @@ used this library with python
 %setup -q
 %patch1
 %patch2
-%patch3 -p 2
-%patch4 -p 1
-%patch5 -p 1
 %patch6 -p 1
-%patch7 -p 1
-%patch8 -p 1
-%patch9 -p 1
 %patch10 -p 1
 
 # Remove bundled utilities (we use Fedora's ones)
@@ -108,7 +95,6 @@ rm -rf Utilities/pvrg
 rm -rf Utilities/rle
 rm -rf Utilities/wxWidgets
 
-cp %{SOURCE2} CMake/
 
 %build
 %cmake	-DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -123,6 +109,7 @@ cp %{SOURCE2} CMake/
 	-DGDCM_BUILD_APPLICATIONS:BOOL=ON \
 	-DCMAKE_BUILD_TYPE:STRING="Release" \
 	-DGDCM_USE_VTK:BOOL=ON \
+	-DGDCM_USE_SYSTEM_CHARLS=ON \
 	-DGDCM_USE_SYSTEM_EXPAT=ON \
 	-DGDCM_USE_SYSTEM_OPENJPEG=ON \
 	-DGDCM_USE_SYSTEM_ZLIB=ON \
@@ -131,7 +118,7 @@ cp %{SOURCE2} CMake/
 	-DGDCM_USE_SYSTEM_OPENSSL=ON \
 	-DGDCM_USE_JPEGLS=ON \
 	-DGDCM_USE_SYSTEM_JPEGLS=ON \
-	-DGDCM_USE_SYSTEM_POPPLER=ON . 
+	-DGDCM_USE_SYSTEM_POPPLER=ON .
 
 #Cannot build wrap_java:	
 #	-DGDCM_VTK_JAVA_JAR:PATH=/usr/share/java/vtk.jar no found! 
@@ -184,6 +171,11 @@ ctest .
 %{python_sitelib}/*
 
 %changelog
+* Tue Nov 01 2011 Orion Poplawski <orion at cora.nwra.com> - 2.0.18-1
+- Update to 2.0.18
+- Drop upstreamed patches
+- Add -DGDCM_USE_SYSTEM_CHARLS=ON
+
 * Fri Oct 28 2011 Rex Dieter <rdieter at fedoraproject.org> - 2.0.17-9
 - rebuild(poppler)