- Remove useless doxygen docs to eliminate multilib conflicts (#533829)

popt-1.13-multilib.patch

@@ -1,23 +0,0 @@
-Patch by Robert Scheck <robert@fedoraproject.org> for popt >= 1.13, which solves the
-multilib/multiarch problem by removing the timestamp within the footer from the doxygen
-generated files.
-
---- popt-1.13/Doxyfile.in				2007-05-25 19:36:23.000000000 +0200
-+++ popt-1.13/Doxyfile.in.multilib			2007-12-15 17:07:34.000000000 +0100
-@@ -659,7 +659,7 @@
- # each generated HTML page. If it is left blank doxygen will generate a 
- # standard footer.
- 
--HTML_FOOTER            = 
-+HTML_FOOTER            = footer_no_timestamp.html
- 
- # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
- # style sheet that is used by each HTML page. It can be used to 
---- popt-1.13/footer_no_timestamp.html			1970-01-01 01:00:00.000000000 +0100
-+++ popt-1.13/footer_no_timestamp.html.multilib		2007-12-14 22:21:35.000000000 +0100
-@@ -0,0 +1,5 @@
-+<hr size="1"><address style="text-align: right;"><small>Generated for $projectname by&nbsp;
-+<a href="http://www.doxygen.org/index.html">
-+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> $doxygenversion </small></address>
-+</body>
-+</html>

popt.spec

@@ -1,16 +1,15 @@
 Summary:	C library for parsing command line parameters
 Name:		popt
 Version:	1.13
-Release:	12%{?dist}
+Release:	13%{?dist}
 License:	MIT
 Group:		System Environment/Libraries
 URL:		http://www.rpm5.org/
 Source:		http://www.rpm5.org/files/%{name}/%{name}-%{version}.tar.gz
-Patch0:		popt-1.13-multilib.patch
 Patch1:		popt-1.13-popt_fprintf.patch
 Patch2:		popt-1.13-alias-equal-arg.patch
 Patch3:		popt-1.13-execfail.patch
-BuildRequires:	gettext, doxygen, graphviz
+BuildRequires:	gettext
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -44,7 +43,6 @@ Install it if you need to link statically with libpopt.
 
 %prep
 %setup -q
-%patch0 -p1 -b .multilib
 %patch1 -p1 -b .popt_fprintf
 %patch2 -p1 -b .alias-equal-arg
 %patch3 -p1 -b .execfail
@@ -52,7 +50,6 @@ Install it if you need to link statically with libpopt.
 %build
 %configure --libdir=/%{_lib}
 make %{?_smp_mflags}
-doxygen
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -89,7 +86,7 @@ make check
 
 %files devel
 %defattr(-,root,root)
-%doc README doxygen/html
+%doc README
 %{_libdir}/libpopt.so
 %{_includedir}/popt.h
 %{_mandir}/man3/popt.3*
@@ -99,6 +96,9 @@ make check
 %{_libdir}/libpopt.a
 
 %changelog
+* Fri Dec 14 2012 Panu Matilainen <pmatilai@redhat.com> - 1.13-13
+- Remove useless doxygen docs to eliminate multilib conflicts (#533829)
+
 * Thu Aug 02 2012 Panu Matilainen <pmatilai@redhat.com> - 1.13-12
 - Hack poptBadOption() to return something semi-meaningful on exec alias
   failures (#697435, #710267)