rpms
/
gdcm
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for 1687233

This commit is contained in:
Ankur Sinha (Ankur Sinha Gmail) 2019-11-23 15:00:19 +00:00
parent 3ac5659b0e
commit 2b478a645b
No known key found for this signature in database
GPG Key ID: F8D8C0BEBAC898BD
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
0002-Fix-export-variables.patch Normal file
View File

@ -0,0 +1,34 @@
From 204375d9cc8ba863a40fab23241844596bbb54e1 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
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

8
gdcm.spec
View File

@ -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 <ankursinha AT fedoraproject DOT org> - 3.0.1-4
- Fix exported variables
- https://bugzilla.redhat.com/show_bug.cgi?id=1687233
* Sat Sep 14 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 3.0.1-3
- Add patch to fix build
- Temporarily disable doc building