rpms/libmusicbrainz5
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix FTBFS with newer doxygen

Browse Source
This commit is contained in:
Christophe Fergeau 2014-06-11 12:43:29 +02:00
parent 463eeebd7c
commit 42d0aa442f
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doxygen.patch Normal file
View File

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

9
libmusicbrainz5.spec
View File

@ -4,7 +4,7 @@
Summary: Library for accessing MusicBrainz servers Summary: Library for accessing MusicBrainz servers
Name: libmusicbrainz5 Name: libmusicbrainz5
Version: 5.0.1 Version: 5.0.1
Release: 9%{?dist} Release: 10%{?dist}
License: LGPLv2 License: LGPLv2
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.musicbrainz.org/ 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 # This patch replaces the removed src/xmlParser.cpp support with libxml2
# and fixes up the cinterface.xml file (libxml2 seems to be stricter). # and fixes up the cinterface.xml file (libxml2 seems to be stricter).
Patch0: 0001-xmlparsing.patch Patch0: 0001-xmlparsing.patch
# Filed upstream as http://tickets.musicbrainz.org/browse/LMB-41
Patch1: doxygen.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: neon-devel BuildRequires: neon-devel
@ -41,6 +43,7 @@ applications which will use %{name}.
%prep %prep
%setup -q -n libmusicbrainz-%{version} %setup -q -n libmusicbrainz-%{version}
%patch0 -p1 -b .xmlParser %patch0 -p1 -b .xmlParser
%patch1 -p1 -b .doxygen
# omit "Generated on ..." timestamps that induce multilib conflicts # omit "Generated on ..." timestamps that induce multilib conflicts
# this is *supposed* to be the doxygen default in fedora these days, but # this is *supposed* to be the doxygen default in fedora these days, but
@ -79,6 +82,10 @@ rm -f docs/installdox
%changelog %changelog
* Wed Jun 11 2014 Christophe Fergeau <cfergeau@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@lists.fedoraproject.org> - 5.0.1-9 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.0.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild