Add patch to fix FTBFS due to variable name/python keyword conflict (bug #1195879)
This commit is contained in:
parent
2d75524421
commit
c4c8d5df38
|
@ -0,0 +1,11 @@
|
||||||
|
diff -up gdcm-2.4.4/Wrapping/Python/gdcmswig.i.as gdcm-2.4.4/Wrapping/Python/gdcmswig.i
|
||||||
|
--- gdcm-2.4.4/Wrapping/Python/gdcmswig.i.as 2014-09-24 01:40:10.000000000 -0600
|
||||||
|
+++ gdcm-2.4.4/Wrapping/Python/gdcmswig.i 2015-02-24 11:54:39.932978476 -0700
|
||||||
|
@@ -769,6 +769,7 @@ EXTEND_CLASS_PRINT(gdcm::ModuleEntry)
|
||||||
|
%include "gdcmQueryFactory.h"
|
||||||
|
%template(CharSetArrayType) std::vector< gdcm::ECharSet >;
|
||||||
|
%include "gdcmCompositeNetworkFunctions.h"
|
||||||
|
+#define as absyn
|
||||||
|
%include "gdcmPresentationContext.h"
|
||||||
|
//EXTEND_CLASS_PRINT(gdcm::PresentationContext)
|
||||||
|
%include "gdcmPresentationContextGenerator.h"
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
Name: gdcm
|
Name: gdcm
|
||||||
Version: 2.4.4
|
Version: 2.4.4
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Grassroots DiCoM is a C++ library to parse DICOM medical files
|
Summary: Grassroots DiCoM is a C++ library to parse DICOM medical files
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
License: BSD
|
License: BSD
|
||||||
|
@ -21,6 +21,9 @@ Patch4: gdcm-2.4.0-no-versioned-dir.patch
|
||||||
# From http://public.kitware.com/pipermail/vtkusers/2013-February/127377.html
|
# From http://public.kitware.com/pipermail/vtkusers/2013-February/127377.html
|
||||||
Patch5: gdcm-0005-support-vtk6.patch
|
Patch5: gdcm-0005-support-vtk6.patch
|
||||||
Patch6: gdcm-2.4.0-find-python27.patch
|
Patch6: gdcm-2.4.0-find-python27.patch
|
||||||
|
# Fix FTBS - https://bugzilla.redhat.com/show_bug.cgi?id=1195879
|
||||||
|
# https://sourceforge.net/p/gdcm/bugs/345/
|
||||||
|
Patch7: gdcm-as.patch
|
||||||
|
|
||||||
BuildRequires: CharLS-devel >= 1.0
|
BuildRequires: CharLS-devel >= 1.0
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
|
@ -109,6 +112,7 @@ used this library with python
|
||||||
%patch3 -p 1
|
%patch3 -p 1
|
||||||
%patch4 -p 1
|
%patch4 -p 1
|
||||||
%patch5 -p 1
|
%patch5 -p 1
|
||||||
|
%patch7 -p 1 -b.as
|
||||||
|
|
||||||
# Remove bundled utilities (we use Fedora's ones)
|
# Remove bundled utilities (we use Fedora's ones)
|
||||||
|
|
||||||
|
@ -266,6 +270,7 @@ make test -C %{_target_platform} || exit 0
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Feb 24 2015 Orion Poplawski <orion@cora.nwra.com> - 2.4.4-2
|
* Tue Feb 24 2015 Orion Poplawski <orion@cora.nwra.com> - 2.4.4-2
|
||||||
- Rebuild for gcc 5 C++11 ABI
|
- Rebuild for gcc 5 C++11 ABI
|
||||||
|
- Add patch to fix FTBFS due to variable name/python keyword conflict (bug #1195879)
|
||||||
|
|
||||||
* Thu Sep 25 2014 Sebastian Pölsterl <sebp@k-d-w.org> - 2.4.4-1
|
* Thu Sep 25 2014 Sebastian Pölsterl <sebp@k-d-w.org> - 2.4.4-1
|
||||||
- Update to 2.4.4
|
- Update to 2.4.4
|
||||||
|
|
Loading…
Reference in New Issue