[cmake] Add patch to find dcmtk in Fedora (Bug #720140)
Orion Poplawski
orion at fedoraproject.org
Fri Jul 22 22:59:42 UTC 2011
commit f0ec2eb1ffd27ae7db8435b6f78613a042349f91
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Fri Jul 22 16:59:28 2011 -0600
Add patch to find dcmtk in Fedora (Bug #720140)
cmake-dcmtk.patch | 12 ++++++++++++
cmake.spec | 8 +++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/cmake-dcmtk.patch b/cmake-dcmtk.patch
new file mode 100644
index 0000000..8d95b85
--- /dev/null
+++ b/cmake-dcmtk.patch
@@ -0,0 +1,12 @@
+--- cmake-2.8.5/Modules/FindDCMTK.cmake.dcmtk 2011-07-08 06:21:44.000000000 -0600
++++ cmake-2.8.5/Modules/FindDCMTK.cmake 2011-07-22 16:55:28.616947321 -0600
+@@ -66,7 +66,8 @@
+ ${DCMTK_DIR}/${lib}/libsrc/Debug
+ ${DCMTK_DIR}/${lib}/Release
+ ${DCMTK_DIR}/${lib}/Debug
+- ${DCMTK_DIR}/lib)
++ ${DCMTK_DIR}/lib
++ /usr/lib/dcmtk)
+
+ mark_as_advanced(DCMTK_${lib}_LIBRARY)
+
diff --git a/cmake.spec b/cmake.spec
index 36f2fcd..1fd955d 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -8,7 +8,7 @@
Name: cmake
Version: 2.8.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Cross-platform make system
Group: Development/Tools
@@ -16,6 +16,8 @@ License: BSD
URL: http://www.cmake.org
Source0: http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz
Source2: macros.cmake
+# Patch to find DCMTK in Fedora (bug #720140)
+Patch0: cmake-dcmtk.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +58,7 @@ The %{name}-gui package contains the Qt based GUI for CMake.
%prep
%setup -q -n %{name}-%{version}%{?rcver}
+%patch0 -p1 -b .dcmtk
%build
@@ -156,6 +159,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog
+* Fri Jul 22 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.5-2
+- Add patch to find dcmtk in Fedora (Bug #720140)
+
* Fri Jul 22 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.5-1
- Update to 2.8.5 final
- Drop issue 12307 patch
More information about the scm-commits
mailing list