From f80598c84d5dc7fe1b7e8da08540d82fb8c5b862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20P=C3=B6lsterl?= <sebp@k-d-w.org>
Date: Mon, 2 Nov 2015 21:33:48 +0100
Subject: [PATCH] Install *.cmake files to %{_libdir}/cmake/ directory

---
 gdcm.spec | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/gdcm.spec b/gdcm.spec
index 9676de7..d533972 100644
--- a/gdcm.spec
+++ b/gdcm.spec
@@ -6,7 +6,7 @@
 
 Name:		gdcm
 Version:	2.6.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Grassroots DiCoM is a C++ library to parse DICOM medical files
 Group:		System Environment/Libraries
 License:	BSD
@@ -139,17 +139,17 @@ pushd %{_target_platform}
 
 %cmake	.. \
 	-DCMAKE_VERBOSE_MAKEFILE=ON \
-	-DGDCM_BUILD_TESTING=OFF \
+	-DGDCM_INSTALL_PACKAGE_DIR=%{_libdir}/cmake/%{name} \
+	-DGDCM_BUILD_TESTING:BOOL=OFF \
 	-DGDCM_DATA_ROOT=../gdcmData/ \
 	-DGDCM_BUILD_EXAMPLES:BOOL=OFF \
 	-DGDCM_DOCUMENTATION:BOOL=OFF \
-	-DGDCM_PDF_DOCUMENTATION:BOOL=OFF \
 	-DGDCM_WRAP_PYTHON:BOOL=ON \
 	-DPYTHON_EXECUTABLE=%{__python3} \
 	-DGDCM_INSTALL_PYTHONMODULE_DIR=%{python3_sitearch} \
 	-DGDCM_WRAP_JAVA:BOOL=OFF \
 	-DGDCM_BUILD_SHARED_LIBS:BOOL=ON \
-	-DGDCM_BUILD_APPLICATIONS:BOOL=ON \
+	-DGDCM_BUILD_APPLICATIONS:BOOL=OFF \
 	-DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
 	-DGDCM_USE_VTK:BOOL=OFF \
 	-DGDCM_USE_SYSTEM_CHARLS:BOOL=ON \
@@ -174,7 +174,8 @@ pushd %{_target_platform}
 
 %cmake	.. \
 	-DCMAKE_VERBOSE_MAKEFILE=ON \
-	-DGDCM_BUILD_TESTING=ON \
+	-DGDCM_INSTALL_PACKAGE_DIR=%{_libdir}/cmake/%{name} \
+	-DGDCM_BUILD_TESTING:BOOL=ON \
 	-DGDCM_DATA_ROOT=../gdcmData/ \
 	-DGDCM_BUILD_EXAMPLES:BOOL=ON \
 	-DGDCM_DOCUMENTATION:BOOL=ON \
@@ -216,10 +217,6 @@ popd
 
 make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
-## Rearranging directory layout and removing version from dir
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/*.cmake $RPM_BUILD_ROOT%{_datadir}/%{name}/
-rmdir $RPM_BUILD_ROOT%{_libdir}/%{name}
-
 ## Cleaning Example dir from cmake cache files + remove 0-length files
 find %{_builddir}/%{?buildsubdir}/Examples -depth -name CMakeFiles | xargs rm -rf
 find %{_builddir}/%{?buildsubdir}/Examples -depth -size 0 | xargs rm -rf
@@ -252,7 +249,7 @@ make test -C %{_target_platform} || exit 0
 %files devel
 %{_includedir}/%{name}/
 %{_libdir}/*.so
-%{_datadir}/%{name}/*.cmake
+%{_libdir}/cmake/%{name}/*.cmake
 
 %files examples
 %{_datadir}/%{name}/Examples/
@@ -264,6 +261,9 @@ make test -C %{_target_platform} || exit 0
 %{python3_sitearch}/*
 
 %changelog
+* Mon Nov 02 2015 Sebastian Pölsterl <sebp@k-d-w.org> - 2.6.1-2
+- Install *.cmake files to %{_libdir}/cmake/ directory
+
 * Sat Oct 31 2015 Sebastian Pölsterl <sebp@k-d-w.org> - 2.6.1-1
 - Update to 2.6.1
 - Remove obsolete patch to allow inplace build