[nifti2dicom] Add upstream patches to fix build
Daniel Vrátil
dvratil at fedoraproject.org
Tue Apr 15 14:44:13 UTC 2014
commit 17319e2c59d0b9517559c4f292708711e01b62f8
Author: Dan Vrátil <dvratil at redhat.com>
Date: Tue Apr 15 16:43:32 2014 +0200
Add upstream patches to fix build
nifti2dicom-fix-build.patch | 12 ++++++++++++
nifti2dicom-fix-desktop-file.patch | 18 ++++++++++++++++++
nifti2dicom.spec | 5 +++++
3 files changed, 35 insertions(+), 0 deletions(-)
---
diff --git a/nifti2dicom-fix-build.patch b/nifti2dicom-fix-build.patch
new file mode 100644
index 0000000..59c1f19
--- /dev/null
+++ b/nifti2dicom-fix-build.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 67a2757..afcc812 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,6 +46,7 @@ include(${ITK_USE_FILE})
+
+ #Check Qt4 Library [Qt4] (4.4.0)
+ find_package(Qt4 4.4.0 REQUIRED)
++include(${QT_USE_FILE})
+
+ #Check VTK Library [Visualization ToolKit]
+ find_package(VTK REQUIRED)
diff --git a/nifti2dicom-fix-desktop-file.patch b/nifti2dicom-fix-desktop-file.patch
new file mode 100644
index 0000000..3900ad0
--- /dev/null
+++ b/nifti2dicom-fix-desktop-file.patch
@@ -0,0 +1,18 @@
+commit c8f2226ddca2adca9273d9b0eac0039c911a38d3
+Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
+Date: Fri Apr 11 12:17:01 2014 +0200
+
+ Fix Keywords entry in .desktop file
+
+ desktop-file-validate script reports a missing trailing semicolon
+
+diff --git a/data/qnifti2dicom.desktop b/data/qnifti2dicom.desktop
+index f4d599c..347390f 100644
+--- a/data/qnifti2dicom.desktop
++++ b/data/qnifti2dicom.desktop
+@@ -5,4 +5,4 @@ Exec=qnifti2dicom
+ Icon=qnifti2dicom
+ Type=Application
+ Categories=Qt;Education;Science;FileTools;ImageProcessing;MedicalSoftware;
+-Keywords=DICOM;NIfTI;Medical Images;Converter;PACS
++Keywords=DICOM;NIfTI;Medical Images;Converter;PACS;
diff --git a/nifti2dicom.spec b/nifti2dicom.spec
index d5d2acb..e0c314d 100644
--- a/nifti2dicom.spec
+++ b/nifti2dicom.spec
@@ -7,7 +7,10 @@ License: GPLv3+
URL: https://github.com/biolab-unige/nifti2dicom
Source0: https://github.com/biolab-unige/nifti2dicom/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# Upstream patches
Patch0: nifti2dicom-vtk6-support.patch
+Patch1: nifti2dicom-fix-build.patch
+Patch2: nifti2dicom-fix-desktop-file.patch
ExcludeArch: ppc ppc64
@@ -42,6 +45,8 @@ that can be imported in a PACS.
%setup -q
%patch0 -p1 -b .vtk6
+%patch1 -p1 -b .fixbuild
+%patch2 -p1 -b .desktop
%build
mkdir -p %{_target_platform}
More information about the scm-commits
mailing list