Add patch to find dcmtk in Fedora (Bug #720140)

This commit is contained in:
Orion Poplawski 2011-07-22 16:59:28 -06:00
parent fb6f0e58a5
commit f0ec2eb1ff
2 changed files with 19 additions and 1 deletions

12
cmake-dcmtk.patch Normal file
View File

@ -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)

View File

@ -8,7 +8,7 @@
Name: cmake Name: cmake
Version: 2.8.5 Version: 2.8.5
Release: 1%{?dist} Release: 2%{?dist}
Summary: Cross-platform make system Summary: Cross-platform make system
Group: Development/Tools Group: Development/Tools
@ -16,6 +16,8 @@ License: BSD
URL: http://www.cmake.org URL: http://www.cmake.org
Source0: http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz Source0: http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz
Source2: macros.cmake Source2: macros.cmake
# Patch to find DCMTK in Fedora (bug #720140)
Patch0: cmake-dcmtk.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 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 %prep
%setup -q -n %{name}-%{version}%{?rcver} %setup -q -n %{name}-%{version}%{?rcver}
%patch0 -p1 -b .dcmtk
%build %build
@ -156,6 +159,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog %changelog
* Fri Jul 22 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.5-2
- Add patch to find dcmtk in Fedora (Bug #720140)
* Fri Jul 22 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.5-1 * Fri Jul 22 2011 Orion Poplawski <orion@cora.nwra.com> - 2.8.5-1
- Update to 2.8.5 final - Update to 2.8.5 final
- Drop issue 12307 patch - Drop issue 12307 patch