rpms/libmusicbrainz3/devel doxygen-footer.html, NONE, 1.1 libmusicbrainz3.spec, 1.9, 1.10

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/libmusicbrainz3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6051

Modified Files:
	libmusicbrainz3.spec 
Added Files:
	doxygen-footer.html 
Log Message:
* Mon Jun 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.0.2-5
- fix doxygen-induced multilib conflicts (#480378)
- add %check section



--- NEW FILE doxygen-footer.html ---
</body>
</html>


Index: libmusicbrainz3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmusicbrainz3/devel/libmusicbrainz3.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- libmusicbrainz3.spec	25 Feb 2009 17:14:27 -0000	1.9
+++ libmusicbrainz3.spec	29 Jun 2009 20:49:19 -0000	1.10
@@ -1,16 +1,21 @@
 
 # Fedora package review: http://bugzilla.redhat.com/451643
 
+# do unit tests
+%define _with_check 1
+
 Summary: Library for accessing MusicBrainz servers
 Name: libmusicbrainz3
 Version: 3.0.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 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
+
 # upstreamed: http://lists.musicbrainz.org/pipermail/musicbrainz-devel/2008-September/002575.html
 # updated to comment out even Requires.private for now, to avoid needless deps
 # (re)introduced by recent fedora pkgconfig behavior change 
@@ -18,6 +23,9 @@ Patch2: libmusicbrainz-3.0.1-private.pat
 Patch3: libmusicbrainz-3.0.2-gcc44.patch
 
 BuildRequires: cmake
+%if 0%{?_check_check}
+BuildRequires: cppunit-devel
+%endif
 BuildRequires: doxygen
 BuildRequires: libdiscid-devel
 BuildRequires: pkgconfig
@@ -46,18 +54,29 @@ applications which will use %{name}. 
 %patch2 -p1 -b .private
 %patch3 -p1 -b .gcc44
 
+# 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
+
 
 %build
 %{cmake} .
 
-make %{?_smp_mflags} 
-make docs
+make %{?_smp_mflags} all docs
 
 
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} 
+make install/fast DESTDIR=%{buildroot} 
+
+
+%check
+%if 0%{?_with_check}
+make check
+%endif
 
 
 %clean
@@ -76,13 +95,17 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%doc docs/
+%doc docs/*
 %{_includedir}/musicbrainz3/
 %{_libdir}/libmusicbrainz3.so
 %{_libdir}/pkgconfig/libmusicbrainz3.pc
 
 
 %changelog
+* Mon Jun 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.0.2-5
+- fix doxygen-induced multilib conflicts (#480378)
+- add %%check section
+
 * Wed Feb 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.0.2-4
 - work harder to omit extraneous pkgconfig deps
 - gcc44 patch