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

Panu Matilainen pmatilai at fedoraproject.org
Fri Dec 14 13:18:49 UTC 2012


commit 835af3695c86d2f7cbfb06f453dec7001d2f31df
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Fri Dec 14 15:17:47 2012 +0200

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

 popt-1.13-multilib.patch |   23 -----------------------
 popt.spec                |   12 ++++++------
 2 files changed, 6 insertions(+), 29 deletions(-)
---
diff --git a/popt.spec b/popt.spec
index 27e73b1..f3cd001 100644
--- a/popt.spec
+++ b/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 at redhat.com> - 1.13-13
+- Remove useless doxygen docs to eliminate multilib conflicts (#533829)
+
 * Thu Aug 02 2012 Panu Matilainen <pmatilai at redhat.com> - 1.13-12
 - Hack poptBadOption() to return something semi-meaningful on exec alias
   failures (#697435, #710267)


More information about the scm-commits mailing list