Apply upstream patch to fix trycompile output (bug #1260490)
This commit is contained in:
parent
c61fc84029
commit
4e6b717c50
@ -13,7 +13,7 @@
|
||||
|
||||
Name: cmake
|
||||
Version: 3.3.1
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: Cross-platform make system
|
||||
|
||||
Group: Development/Tools
|
||||
@ -31,6 +31,9 @@ Source3: cmake.attr
|
||||
Source4: cmake.prov
|
||||
# Patch to find DCMTK in Fedora (bug #720140)
|
||||
Patch0: cmake-dcmtk.patch
|
||||
# Patch to fix trycompile output
|
||||
# http://www.cmake.org/gitweb?p=cmake.git;a=patch;h=371fe92e
|
||||
Patch1: cmake.git-371fe92e.patch
|
||||
# Patch to fix RindRuby vendor settings
|
||||
# http://public.kitware.com/Bug/view.php?id=12965
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=822796
|
||||
@ -106,6 +109,7 @@ The %{name}-gui package contains the Qt based GUI for CMake.
|
||||
%setup -q -n %{name}-%{version}%{?rcver}
|
||||
# We cannot use backups with patches to Modules as they end up being installed
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch624 -p1
|
||||
%patch640 -p1
|
||||
@ -281,6 +285,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Sep 9 2015 Orion Poplawski <orion@cora.nwra.com> - 3.3.1-4
|
||||
- Apply upstream patch to fix trycompile output (bug #1260490)
|
||||
|
||||
* Tue Aug 25 2015 Rex Dieter <rdieter@fedoraproject.org> 3.3.1-3
|
||||
- pull in some upstream fixes (FindPkgConfig,boost-1.59)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user