[libmusicbrainz5] Fix FTBFS with newer doxygen

Christophe Fergeau teuf at fedoraproject.org
Wed Jun 11 10:46:25 UTC 2014


commit 42d0aa442f5d72dc859de7f928c3e2a023c72cd6
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Jun 11 12:43:29 2014 +0200

    Fix FTBFS with newer doxygen

 doxygen.patch        |   12 ++++++++++++
 libmusicbrainz5.spec |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/doxygen.patch b/doxygen.patch
new file mode 100644
index 0000000..5bee12d
--- /dev/null
+++ b/doxygen.patch
@@ -0,0 +1,12 @@
+diff --git a/Doxyfile.cmake b/Doxyfile.cmake
+index 1dced85..64e13ad 100644
+--- a/Doxyfile.cmake
++++ b/Doxyfile.cmake
+@@ -1,6 +1,7 @@
+ PROJECT_NAME        = "${PROJECT_NAME}"
+ PROJECT_NUMBER      = ${PROJECT_VERSION}
+ HTML_OUTPUT         = docs
++GENERATE_HTML       = YES
+ GENERATE_LATEX      = NO
+ GENERATE_MAN        = NO
+ GENERATE_RTF        = NO
diff --git a/libmusicbrainz5.spec b/libmusicbrainz5.spec
index d4c2bfa..7ac5530 100644
--- a/libmusicbrainz5.spec
+++ b/libmusicbrainz5.spec
@@ -4,7 +4,7 @@
 Summary: Library for accessing MusicBrainz servers
 Name: libmusicbrainz5
 Version: 5.0.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 URL: http://www.musicbrainz.org/
@@ -16,6 +16,8 @@ Source0: libmusicbrainz-%{version}-clean.tar.gz
 # This patch replaces the removed src/xmlParser.cpp support with libxml2
 # and fixes up the cinterface.xml file (libxml2 seems to be stricter).
 Patch0: 0001-xmlparsing.patch
+# Filed upstream as http://tickets.musicbrainz.org/browse/LMB-41
+Patch1: doxygen.patch
 BuildRequires: cmake
 BuildRequires: doxygen
 BuildRequires: neon-devel
@@ -41,6 +43,7 @@ applications which will use %{name}.
 %prep
 %setup -q -n libmusicbrainz-%{version}
 %patch0 -p1 -b .xmlParser
+%patch1 -p1 -b .doxygen
 
 # omit "Generated on ..." timestamps that induce multilib conflicts
 # this is *supposed* to be the doxygen default in fedora these days, but
@@ -79,6 +82,10 @@ rm -f docs/installdox
 
 
 %changelog
+* Wed Jun 11 2014 Christophe Fergeau <cfergeau at redhat.com> 5.0.1-10
+- Fix documentation build with doxygen 1.8.7
+  Resolves: rhbz#1106042
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list