rpms/netpbm/FC-6 netpbm.spec,1.85,1.86

[fedora-cvs-commits at redhat.com]

Author: jnovy

Update of /cvs/dist/rpms/netpbm/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv13374

Modified Files:
	netpbm.spec 
Log Message:
- package map files needed by pnmtopalm (#244983)
- fix pgmminkowski.1 man page
- fix license, buildrequires, obsoletes



Index: netpbm.spec
===================================================================
RCS file: /cvs/dist/rpms/netpbm/FC-6/netpbm.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- netpbm.spec	5 Feb 2007 12:43:25 -0000	1.85
+++ netpbm.spec	16 Jul 2007 11:48:15 -0000	1.86
@@ -1,8 +1,8 @@
-Summary: A library for handling different graphics file formats.
+Summary: A library for handling different graphics file formats
 Name: netpbm
 Version: 10.35
-Release: 9%{?dist}
-License: freeware
+Release: 10%{?dist}
+License: Assorted licenses, see %{_docdir}/%{name}-%{version}/copyright_summary
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
 Source0: netpbm-%{version}.l1.tar.bz2
@@ -25,9 +25,8 @@
 Patch16: netpbm-10.35-pbmtog3segfault.patch
 Patch17: netpbm-10.35-pbmtomacp.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, perl, flex
+BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel
-Obsoletes: libgr
 
 %description
 The netpbm package contains a library of functions which support
@@ -36,10 +35,9 @@
 .ppm (portable pixmaps) and others.
 
 %package devel
-Summary: Development tools for programs which will use the netpbm libraries.
+Summary: Development tools for programs which will use the netpbm libraries
 Group: Development/Libraries
 Requires: netpbm = %{version}-%{release}
-Obsoletes: libgr-devel
 
 %description devel
 The netpbm-devel package contains the header files and static libraries,
@@ -51,10 +49,9 @@
 to have the netpbm package installed.
 
 %package progs
-Summary: Tools for manipulating graphics files in netpbm supported formats.
+Summary: Tools for manipulating graphics files in netpbm supported formats
 Group: Applications/Multimedia
 Requires: netpbm = %{version}-%{release}
-Obsoletes: libgr-progs
 
 %description progs
 The netpbm-progs package contains a group of scripts for manipulating the
@@ -129,7 +126,7 @@
 	XML2LIBS="NONE"
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT
 make package pkgdir=$RPM_BUILD_ROOT/usr LINUXSVGALIB="NONE" XML2LIBS="NONE"
@@ -146,6 +143,9 @@
 mkdir -p $RPM_BUILD_ROOT%{_mandir}
 tar jxvf %{SOURCE1} -C $RPM_BUILD_ROOT%{_mandir}
 
+# Get rid of the useless non-ascii character in pgmminkowski.1
+sed -i 's/\xa0//' $RPM_BUILD_ROOT%{_mandir}/man1/pgmminkowski.1
+
 # Don't ship man pages for non-existent binaries and bogus ones
 for i in hpcdtoppm pcdovtoppm pnmtojbig \
 	 ppmsvgalib vidtoppm picttoppm jbigtopnm \
@@ -155,7 +155,8 @@
 done
 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/extendedopacity.5
 
-mv $RPM_BUILD_ROOT/usr/misc/*.map $RPM_BUILD_ROOT%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/netpbm
+mv $RPM_BUILD_ROOT/usr/misc/*.map $RPM_BUILD_ROOT%{_datadir}/netpbm/
 rm -rf $RPM_BUILD_ROOT/usr/README
 rm -rf $RPM_BUILD_ROOT/usr/VERSION
 rm -rf $RPM_BUILD_ROOT/usr/link
@@ -166,7 +167,7 @@
 
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
@@ -174,7 +175,7 @@
 
 %files
 %defattr(-,root,root)
-%doc doc/COPYRIGHT.PATENT doc/GPL_LICENSE.txt doc/HISTORY README
+%doc doc/copyright_summary doc/COPYRIGHT.PATENT doc/GPL_LICENSE.txt doc/HISTORY README
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -186,11 +187,16 @@
 %files progs
 %defattr(-,root,root)
 %{_bindir}/*
-%{_libdir}/*.map
 %{_mandir}/man1/*
 %{_mandir}/man5/*
+%{_datadir}/netpbm/
 
 %changelog
+* Mon Jul 16 2007 Jindrich Novy <jnovy at redhat.com> 10.35-10
+- package map files needed by pnmtopalm (#244983)
+- fix pgmminkowski.1 man page
+- fix license, buildrequires, obsoletes
+
 * Mon Feb  5 2007 Jindrich Novy <jnovy at redhat.com> 10.35-9
 - fix pbmtomacp buffer overflow (#226969)