Attachment 575997 Details for Bug 533829 – Fix - introduce -devel-doc subpackage.

[patch] Fix - introduce -devel-doc subpackage.

popt-devel-doc.patch (text/plain), 3.38 KB, created by Jan Kratochvil on 2012-04-08 08:06:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kratochvil

Created: 2012-04-08 08:06:10 UTC

Size: 3.38 KB

patch

obsolete

>--- a/popt-1.13-multilib.patch
>+++ /dev/null
>@@ -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>
>--- a/popt.spec
>+++ b/popt.spec
>@@ -1,12 +1,11 @@
> Summary:	C library for parsing command line parameters
> Name:		popt
> Version:	1.13
>-Release:	10%{?dist}
>+Release:	11%{?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
> BuildRequires:	gettext, doxygen, graphviz
>@@ -25,12 +24,21 @@ shell-like rules.
> %package devel
> Summary:	Development files for the popt library
> Group:		Development/Libraries
>-Requires:	%{name} = %{version}-%{release}
>+Requires:	%{name}%{?_isa} = %{version}-%{release}
> 
> %description devel
> The popt-devel package includes header files and libraries necessary
>-for developing programs which use the popt C library. It contains the
>-API documentation of the popt library, too.
>+for developing programs which use the popt C library.
>+
>+For the API documentation of the popt library see %{name}-devel-doc.
>+
>+%package devel-doc
>+Summary:	Development documentation for the popt library
>+Group:		Documentation
>+Requires:	%{name}-devel = %{version}-%{release}
>+
>+%description devel-doc
>+The popt-devel-doc package contains API documentation of the popt library.
> 
> %package static
> Summary:	Static library for parsing command line parameters
>@@ -43,7 +51,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
> 
>@@ -84,9 +91,12 @@ rm -rf $RPM_BUILD_ROOT
> 
> %files devel
> %defattr(-,root,root)
>-%doc README doxygen/html
> %{_libdir}/libpopt.so
> %{_includedir}/popt.h
>+
>+%files devel-doc
>+%defattr(-,root,root)
>+%doc README doxygen/html
> %{_mandir}/man3/popt.3*
> 
> %files static
>@@ -94,6 +104,10 @@ rm -rf $RPM_BUILD_ROOT
> %{_libdir}/libpopt.a
> 
> %changelog
>+* Sun Apr  8 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 1.13-11
>+- Introduce -devel-doc subpackage for multilib problems (#533829)
>+- Add missing %%{?_isa} Requires of the -devel subpackage.
>+
> * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.13-10
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 533829: 575997