From 0e6e4af91f25ea0a75747049710da5525b78ad22 Mon Sep 17 00:00:00 2001 From: Ryan Curtin Date: Jun 03 2016 13:40:20 +0000 Subject: Add doxygen patch. --- diff --git a/doxygen.patch b/doxygen.patch new file mode 100644 index 0000000..8afd126 --- /dev/null +++ b/doxygen.patch @@ -0,0 +1,28 @@ +diff --git a/src/mlpack/core/tree/binary_space_tree/traits.hpp b/src/mlpack/core/tree/binary_space_tree/traits.hpp +index d523a59..e91cbb7 100644 +--- a/src/mlpack/core/tree/binary_space_tree/traits.hpp ++++ b/src/mlpack/core/tree/binary_space_tree/traits.hpp +@@ -31,8 +31,7 @@ template class BoundType, + template + class SplitType> +-class TreeTraits> ++class TreeTraits> + { + public: + /** +diff --git a/src/mlpack/core/tree/rectangle_tree/traits.hpp b/src/mlpack/core/tree/rectangle_tree/traits.hpp +index 2f53ae5..e0d9faa 100644 +--- a/src/mlpack/core/tree/rectangle_tree/traits.hpp ++++ b/src/mlpack/core/tree/rectangle_tree/traits.hpp +@@ -30,8 +30,7 @@ template +-class TreeTraits> ++class TreeTraits> + { + public: + /** diff --git a/mlpack.spec b/mlpack.spec index 645176a..805ac10 100644 --- a/mlpack.spec +++ b/mlpack.spec @@ -17,6 +17,9 @@ Patch0: cmake_libdir.patch # that. Patch1: no_exclude_build.patch +# Newer versions of Doxygen choke on the TreeTraits definitions for some reason. +Patch2: doxygen.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Use cmake28 package on RHEL. @@ -114,7 +117,7 @@ margins. This package provides the Doxygen-generated documentation for mlpack. %setup -q %patch0 -p1 %patch1 -p1 - +%patch2 -p1 %build %if 0%{?rhel} @@ -239,6 +242,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Thu Feb 11 2016 Ryan Curtin - 2.0.1-1 - Update to latest stable version. +- Add doxygen.patch for bug with newer Doxygen versions. * Thu Feb 11 2016 José Matos - 1.0.11-11 - rebuild for armadillo 6