diff --git a/gdcm-2.6-fix-cmake-config-paths.patch b/gdcm-2.6-fix-cmake-config-paths.patch new file mode 100644 index 0000000..3e5c7ef --- /dev/null +++ b/gdcm-2.6-fix-cmake-config-paths.patch @@ -0,0 +1,14 @@ +--- gdcm-2.6.1.orig/CMake/ExportConfiguration/GDCMConfig.cmake.in 2015-10-30 17:25:14.000000000 +0100 ++++ gdcm-2.6.1/CMake/ExportConfiguration/GDCMConfig.cmake.in 2015-11-15 23:54:41.944053797 +0100 +@@ -37,9 +37,9 @@ + if(EXISTS ${SELF_DIR}/GDCMTargets.cmake) + # This is an install tree + include(${SELF_DIR}/GDCMTargets.cmake) +- get_filename_component(GDCM_INCLUDE_ROOT "${SELF_DIR}/../../@GDCM_INSTALL_INCLUDE_DIR@" ABSOLUTE) ++ get_filename_component(GDCM_INCLUDE_ROOT "@GDCM_INSTALL_INCLUDE_DIR@" ABSOLUTE) + set(GDCM_INCLUDE_DIRS ${GDCM_INCLUDE_ROOT}) +- get_filename_component(GDCM_LIB_ROOT "${SELF_DIR}/../../@GDCM_INSTALL_LIB_DIR@" ABSOLUTE) ++ get_filename_component(GDCM_LIB_ROOT "@GDCM_INSTALL_LIB_DIR@" ABSOLUTE) + set(GDCM_LIBRARY_DIRS ${GDCM_LIB_ROOT}) + else() + if(EXISTS ${SELF_DIR}/GDCMExports.cmake) diff --git a/gdcm.spec b/gdcm.spec index a2fa672..fab649c 100644 --- a/gdcm.spec +++ b/gdcm.spec @@ -6,7 +6,7 @@ Name: gdcm Version: 2.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Grassroots DiCoM is a C++ library to parse DICOM medical files Group: System Environment/Libraries License: BSD @@ -20,6 +20,7 @@ Patch3: gdcm-2.4.0-no-versioned-dir.patch # From http://public.kitware.com/pipermail/vtkusers/2013-February/127377.html #Patch4: gdcm-0005-support-vtk6.patch Patch5: gdcm-2.4.0-find-python27.patch +Patch6: gdcm-2.6-fix-cmake-config-paths.patch BuildRequires: CharLS-devel >= 1.0 BuildRequires: cmake @@ -116,7 +117,7 @@ used this library with python %patch1 -p 1 %patch2 -p 1 %patch3 -p 1 -#%patch4 -p 1 +%patch6 -p 1 # Remove bundled utilities (we use Fedora's ones) @@ -153,6 +154,10 @@ pushd %{_target_platform} %cmake .. \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DGDCM_INSTALL_PACKAGE_DIR=%{_libdir}/cmake/%{name} \ + -DGDCM_INSTALL_INCLUDE_DIR=%{_includedir}/%{name} \ + -DGDCM_INSTALL_DOC_DIR=%{_docdir}/%{name} \ + -DGDCM_INSTALL_MAN_DIR=%{_mandir} \ + -DGDCM_INSTALL_LIB_DIR=%{_libdir} \ -DGDCM_BUILD_TESTING:BOOL=OFF \ -DGDCM_DATA_ROOT=../gdcmData/ \ -DGDCM_BUILD_EXAMPLES:BOOL=OFF \ @@ -188,6 +193,10 @@ pushd %{_target_platform} %cmake .. \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DGDCM_INSTALL_PACKAGE_DIR=%{_libdir}/cmake/%{name} \ + -DGDCM_INSTALL_INCLUDE_DIR=%{_includedir}/%{name} \ + -DGDCM_INSTALL_DOC_DIR=%{_docdir}/%{name} \ + -DGDCM_INSTALL_MAN_DIR=%{_mandir} \ + -DGDCM_INSTALL_LIB_DIR=%{_libdir} \ -DGDCM_BUILD_TESTING:BOOL=ON \ -DGDCM_DATA_ROOT=../gdcmData/ \ -DGDCM_BUILD_EXAMPLES:BOOL=ON \ @@ -276,6 +285,9 @@ make test -C %{_target_platform} || exit 0 %{python3_sitearch}/* %changelog +* Sun Nov 15 2015 Sebastian Pölsterl - 2.6.1-5 +- Fix paths in GDCMConfig.cmake + * Sun Nov 15 2015 Sebastian Pölsterl - 2.6.1-4 - Build with poppler, json and libxml2 support - Add applications subpackage as requirement to devel subpackage @@ -284,7 +296,7 @@ make test -C %{_target_platform} || exit 0 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 * Mon Nov 02 2015 Sebastian Pölsterl - 2.6.1-2 -- Install *.cmake files to %{_libdir}/cmake/ directory +- Install *.cmake files to _libdir/cmake/ directory - Move command line programs to applications sub-package * Sat Oct 31 2015 Sebastian Pölsterl - 2.6.1-1