From b745544440da152c894e1bebb268e04ece8c209b Mon Sep 17 00:00:00 2001
From: Mario Ceresa <mrceresa@gmail.com>
Date: Sun, 14 Apr 2013 15:23:51 +0200
Subject: [PATCH] Added doc package. Various fixes to specfile

---
 gdcm.spec | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/gdcm.spec b/gdcm.spec
index ef3e08b..3a4ce5d 100644
--- a/gdcm.spec
+++ b/gdcm.spec
@@ -11,7 +11,7 @@ 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%20%{version}/gdcm-%{version}.tar.bz2
+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
@@ -55,6 +55,17 @@ RLE, J2K, deflated, JPEG-LS (very experimental) (MPEG2 compression is not
 supported)
 - Papyrus V2 and V3 file headers should be readable, 
 
+%package	doc
+Summary:	Includes html documentation for gdcm
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description doc
+
+You should install the gdcm-doc package if you would like to
+access upstream documentation for gdcm
+
+
 %package	devel
 Summary:	Libraries and headers for GDCM
 Group:		Development/Libraries
@@ -147,6 +158,15 @@ rmdir $RPM_BUILD_ROOT%{_libdir}/gdcm
 find %{_builddir}/%{?buildsubdir}/Examples -depth -name CMakeFiles | xargs rm -rf
 find %{_builddir}/%{?buildsubdir}/Examples -depth -size 0 | xargs rm -rf
 
+%check
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/bin
+ctest .
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
 %files
 %doc %{_mandir}/man1/*.1*
 %doc AUTHORS Copyright.txt README.Copyright.txt README.txt
@@ -155,13 +175,9 @@ find %{_builddir}/%{?buildsubdir}/Examples -depth -size 0 | xargs rm -rf
 %{_libdir}/*.so.*
 %{_datadir}/gdcm/XML
 
-%check
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/bin
-ctest .
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%files doc
+%dir %{_docdir}/%{name}/
+%{_docdir}/%{name}/*
 
 %files devel
 %dir %{_includedir}/gdcm/
@@ -175,7 +191,10 @@ ctest .
 
 %changelog
 * Sun Apr 14 2013 Mario Ceresa <mrceresa@fedoraproject.org> - 2.2.3-1
-- Upgrade to new version
+- Upgrade to 2.2.3
+- Drop upstreamed patches
+- Added doc package
+- Various fixes to spec file
 
 * Mon Feb 4 2013 Mario Ceresa <mrceresa@fedoraproject.org> - 2.0.18-8
 - Added missing BR for pdflatex