[libigtl] Install cmake support files in _libdir not _datadir

mrceresa mrceresa at fedoraproject.org
Wed Apr 24 13:45:28 UTC 2013


commit cb14fc7f16ce3e1a60f1701a3a3cb9129ed14c2b
Author: Mario Ceresa <mrceresa at gmail.com>
Date:   Wed Apr 24 15:45:15 2013 +0200

    Install cmake support files in _libdir not _datadir

 libigtl.spec |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/libigtl.spec b/libigtl.spec
index 17fb11a..4269e86 100644
--- a/libigtl.spec
+++ b/libigtl.spec
@@ -1,11 +1,13 @@
 %global _short_name igtl
+%global _full_name openigtlink
+%global _full_cap_name OpenIGTLink
 %global _ver_major 1
 %global _ver_minor 9
 %global _ver_release 7
 
 Name:		lib%{_short_name}
 Version:	%{_ver_major}.%{_ver_minor}.%{_ver_release}
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Network communication library for image-guided therapy
 
 License:	BSD
@@ -67,7 +69,7 @@ Requires:	%{name}%{?_isa} = %{version}-%{release}
 The %{name}-doc package contains documentation for %{name}
 
 %prep
-%setup -q -n openigtlink-OpenIGTLink-4caf9cf
+%setup -q -n %{_full_name}-%{_full_cap_name}-4caf9cf
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -85,7 +87,7 @@ pushd %{_target_platform}
     -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo"\
     -DCMAKE_VERBOSE_MAKEFILE=ON\
     -DOpenIGTLink_INSTALL_LIB_DIR=%{_lib} \
-    -DOpenIGTLink_INSTALL_PACKAGE_DIR=%{_datadir}/cmake/Modules/ \
+    -DOpenIGTLink_INSTALL_PACKAGE_DIR=%{_libdir}/cmake/%{_full_cap_name}/ \
     -DBUILD_TESTING=ON \
     -DBUILD_DOCUMENTATION=ON \
     -DPDFLATEX_COMPILER=%{_bindir}/pdflatex
@@ -127,7 +129,7 @@ make test -C %{_target_platform}
 %dir %{_includedir}/%{_short_name}/
 %{_includedir}/%{_short_name}/*
 %{_libdir}/*.so
-%{_datadir}/cmake/Modules/
+%{_libdir}/cmake/%{_full_cap_name}/
 
 %files doc
 %{_docdir}/%{name}-%{version}/OpenIGTLinkIJ2008.pdf
@@ -135,6 +137,10 @@ make test -C %{_target_platform}
 
 
 %changelog
+* Wed Apr 24 2013 Mario Ceresa <mrceresa at fedoraproject.org> 1.9.7-10
+- New location for cmake files
+- Used global parameters for names
+
 * Thu Apr 18 2013 Mario Ceresa <mrceresa at fedoraproject.org> 1.9.7-9
 - Moved cmake use files to modules directory
 


More information about the scm-commits mailing list