[libmusicbrainz3] - libmusicbrainz3-devel multilib conflict (#480378) - drop extraneous pkgconfig dep baggage

[Rex Dieter]

commit f23b71b50e45a2bf2ff07cd9d8c62c1fc3458ec7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Oct 18 08:44:06 2010 -0500

    - libmusicbrainz3-devel multilib conflict (#480378)
    - drop extraneous pkgconfig dep baggage

 doxygen-footer.html  |    2 --
 libmusicbrainz3.spec |   23 +++++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/libmusicbrainz3.spec b/libmusicbrainz3.spec
index 65b30dc..8b73c77 100644
--- a/libmusicbrainz3.spec
+++ b/libmusicbrainz3.spec
@@ -14,8 +14,6 @@ URL: http://www.musicbrainz.org/
 Source0: ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source10: doxygen-footer.html
-
 BuildRequires: cmake
 %if 0%{?_with_check}
 BuildRequires: cppunit-devel
@@ -33,10 +31,7 @@ create CD Index Disk ids from audio CD roms.
 %package devel
 Summary: Headers for developing programs that will use %{name} 
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
-# patch2 removes the need for these
-#Requires: libdiscid-devel neon-devel
+Requires: %{name}%{?_isa} = %{version}-%{release}
 %description devel
 This package contains the headers that programmers will need to develop
 applications which will use %{name}. 
@@ -45,17 +40,17 @@ applications which will use %{name}.
 %prep
 %setup -q -n libmusicbrainz-%{version}
 
-# until doxygen is fixed, something like
-# http://bugzilla.gnome.org/show_bug.cgi?id=579303 , hack out
-# mulitilib-conflicting doxygen footers
-install -p %{SOURCE10} doxygen-footer.html
-echo "HTML_FOOTER         = doxygen-footer.html" >> Doxygen
+# omit "Generated on ..." timestamps that induce multilib conflicts
+# this is *supposed* to be the doxygen default in fedora these days, but
+# it seems there's still a bug or 2 there -- Rex
+echo "HTML_TIMESTAMP      = NO" >> Doxyfile.cmake
 
 
 %build
 %{cmake} .
 
-make %{?_smp_mflags} all docs
+make %{?_smp_mflags}
+make %{?_smp_mflags} docs
 
 
 %install
@@ -95,6 +90,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 18 2010 Rex Dieter <rdieter at fedoraproject.rog> 3.0.3-2
+- libmusicbrainz3-devel multilib conflict (#480378)
+- drop extraneous pkgconfig dep baggage
+
 * Mon Oct 18 2010 Bastien Nocera <bnocera at redhat.com> 3.0.3-1
 - Update to 3.0.3