diff --git a/0002-Fix-export-variables.patch b/0002-Fix-export-variables.patch new file mode 100644 index 0000000..b9fc89c --- /dev/null +++ b/0002-Fix-export-variables.patch @@ -0,0 +1,34 @@ +From 204375d9cc8ba863a40fab23241844596bbb54e1 Mon Sep 17 00:00:00 2001 +From: "Ankur Sinha (Ankur Sinha Gmail)" +Date: Sat, 23 Nov 2019 12:51:46 +0000 +Subject: [PATCH 2/2] Fix export variables + +--- + CMake/ExportConfiguration/GDCMConfig.cmake.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMake/ExportConfiguration/GDCMConfig.cmake.in b/CMake/ExportConfiguration/GDCMConfig.cmake.in +index f8e9d0ba5..4894d293e 100644 +--- a/CMake/ExportConfiguration/GDCMConfig.cmake.in ++++ b/CMake/ExportConfiguration/GDCMConfig.cmake.in +@@ -37,14 +37,14 @@ get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) + 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) + # This is a build tree +- set( GDCM_INCLUDE_DIRS "@GDCM_INCLUDE_PATH@") ++ set(GDCM_INCLUDE_DIRS "@GDCM_INCLUDE_PATH@") + set(GDCM_LIBRARY_DIRS "@GDCM_LIBRARY_DIR@") + + include(${SELF_DIR}/GDCMExports.cmake) +-- +2.23.0 + diff --git a/gdcm.spec b/gdcm.spec index cc1d1a3..278f1de 100644 --- a/gdcm.spec +++ b/gdcm.spec @@ -3,7 +3,7 @@ Name: gdcm Version: 3.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Grassroots DiCoM is a C++ library to parse DICOM medical files License: BSD URL: http://gdcm.sourceforge.net/wiki/index.php/Main_Page @@ -14,6 +14,8 @@ Source1: http://downloads.sourceforge.net/project/gdcm/gdcmData/gdcmData/gdcm Patch1: 0001-3.0.1-Use-copyright.patch # https://sourceforge.net/p/gdcm/bugs/487/ Patch2: gdcm-2.8.8-dont_use_EOF.patch +# Fix for 1687233 +Patch3: 0002-Fix-export-variables.patch BuildRequires: CharLS-devel >= 2.0 BuildRequires: cmake @@ -266,6 +268,10 @@ make test -C %{_target_platform} || exit 0 %{python3_sitearch}/__pycache__/%{name}* %changelog +* Sat Nov 23 2019 Ankur Sinha - 3.0.1-4 +- Fix exported variables +- https://bugzilla.redhat.com/show_bug.cgi?id=1687233 + * Sat Sep 14 2019 Ankur Sinha - 3.0.1-3 - Add patch to fix build - Temporarily disable doc building