From d9204f32f68bc58eba976758a21c988904aab733 Mon Sep 17 00:00:00 2001
From: Mario Ceresa <mrceresa@gmail.com>
Date: Apr 26 2013 16:22:17 +0000
Subject: Include itkTestDriver by default and move libaries into _libdir


---

diff --git a/InsightToolkit.spec b/InsightToolkit.spec
index 60b38e6..5632561 100644
--- a/InsightToolkit.spec
+++ b/InsightToolkit.spec
@@ -10,7 +10,7 @@
 Name:           InsightToolkit
 Summary:        Insight Toolkit library for medical image processing
 Version:        %{_ver_major}.%{_ver_minor}.%{_ver_release}
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        ASL 2.0 
 Group:          Applications/Engineering
 Source0:        http://sourceforge.net/projects/itk/files/itk/%{_ver_major}.%{_ver_minor}/%{name}-%{version}.tar.gz
@@ -131,7 +131,7 @@ pushd %{_target_platform}
        -DITK_USE_SYSTEM_VXL=ON \
        -DITK_USE_SYSTEM_SWIG=ON \
        -DITK_USE_SYSTEM_GCCXML=ON \
-       -DITK_INSTALL_LIBRARY_DIR=%{_lib}/%{name} \
+       -DITK_INSTALL_LIBRARY_DIR=%{_lib}/ \
        -DITK_INSTALL_INCLUDE_DIR=include/%{name} \
        -DITK_INSTALL_PACKAGE_DIR=%{_lib}/cmake/%{name}/ \
        -DITK_INSTALL_RUNTIME_DIR:PATH=%{_bindir} \
@@ -149,8 +149,8 @@ mkdir -p %{buildroot}%{_datadir}/%{name}/examples
 cp -ar Examples/* %{buildroot}%{_datadir}/%{name}/examples/
 
 # Install ldd config file
-mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/
-echo %{_libdir}/%{name} > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf
+#mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/
+#echo %{_libdir}/%{name} > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf
 
 %check
 # There are a couple of tests randomly failing on f19 and rawhide and I'm debugging
@@ -165,29 +165,33 @@ make test -C %{_target_platform} || exit 0
 %dir %{_datadir}/%{name}
 %dir %{_libdir}/%{name}
 #In order to recognize /usr/lib64/InsightToolkit we need to ship a proper file for /etc/ld.so.conf.d/
-%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}.conf
-%{_libdir}/%{name}/*.so.*
+#%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}.conf
+%{_libdir}/*.so.*
+%{_bindir}/itkTestDriver
 %doc LICENSE README.txt NOTICE
 
 
 %files devel
-%{_libdir}/%{name}/*.so
+%{_libdir}/*.so
 %{_libdir}/cmake/%{name}/
 %{_includedir}/%{name}/
 
 
 %files examples
 %{_datadir}/%{name}/examples
-%{_bindir}/*
+
 
 %files doc
-%defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}/
 %{_docdir}/ITK-%{_ver_major}.%{_ver_minor}/
 %doc ItkSoftwareGuide-2.4.0.pdf
 
 
 %changelog
+* Fri Apr 26 2013 Mario Ceresa mrceresa fedoraproject org InsightToolkit 4.3.1-10
+- Install itkTestDriver in default package
+- Install libraries into _libdir and drop ldconfig file
+
 * Tue Apr 23 2013 Mario Ceresa mrceresa fedoraproject org InsightToolkit 4.3.1-9
 - Changed license to ASL 2.0