From abafd87444c5e892c726562d6ddaea0c85b1b624 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Thu, 18 Mar 2010 09:45:46 +0000 Subject: [PATCH] - package docs in separate netpbm-doc package (#492437) - don't package patch backups in documentation - netpbm-progs package requires ghostscript --- netpbm.spec | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/netpbm.spec b/netpbm.spec index 94560ba..585a12c 100644 --- a/netpbm.spec +++ b/netpbm.spec @@ -1,7 +1,7 @@ Summary: A library for handling different graphics file formats Name: netpbm Version: 10.47.10 -Release: 2%{?dist} +Release: 3%{?dist} # See copyright_summary for details License: BSD and GPLv2 and IJG and MIT and Public Domain Group: System Environment/Libraries @@ -57,6 +57,7 @@ to have the netpbm package installed. %package progs Summary: Tools for manipulating graphics files in netpbm supported formats Group: Applications/Multimedia +Requires: ghostscript Requires: netpbm = %{version}-%{release} %description progs @@ -69,6 +70,18 @@ scripts for converting from one graphics file format to another. If you need to use these conversion scripts, you should install netpbm-progs. You'll also need to install the netpbm package. +%package doc +Summary: Documentation for tools manipulating graphics files in netpbm supported formats +Group: Applications/Multimedia +Requires: netpbm-progs = %{version}-%{release} + +%description doc +The netpbm-doc package contains a documentation in HTML format for utilities +present in netpbm-progs package. + +If you need to look into the HTML documentation, you should install +netpbm-doc. You'll also need to install the netpbm-progs package. + %prep %setup -q %patch1 -p1 -b .time @@ -85,7 +98,7 @@ netpbm-progs. You'll also need to install the netpbm package. %patch12 -p1 -b .pamscale %patch13 -p1 -b .glibc %patch14 -p1 -b .svgtopam -%patch15 -p1 -b .docfix +%patch15 -p1 %patch16 -p1 -b .ppmfadeusage %patch17 -p1 -b .fiasco-overflow %patch18 -p1 -b .lz @@ -208,7 +221,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc doc/copyright_summary doc/COPYRIGHT.PATENT doc/GPL_LICENSE.txt doc/HISTORY README userguide +%doc doc/copyright_summary doc/COPYRIGHT.PATENT doc/GPL_LICENSE.txt doc/HISTORY README %{_libdir}/lib*.so.* %files devel @@ -225,7 +238,16 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/* %{_datadir}/netpbm/ +%files doc +%defattr(-,root,root) +%doc userguide/* + %changelog +* Thu Mar 18 2010 Jindrich Novy 10.47.10-3 +- package docs in separate netpbm-doc package (#492437) +- don't package patch backups in documentation +- netpbm-progs package requires ghostscript + * Wed Mar 17 2010 Jindrich Novy 10.47.10-2 - pgmtopbm should generate PBM, not PAM file - forwardport pnmmontage from 10.35 to make it work