diff --git a/netpbm-10.24-nodoc.patch b/netpbm-10.24-nodoc.patch new file mode 100644 index 0000000..2ecf665 --- /dev/null +++ b/netpbm-10.24-nodoc.patch @@ -0,0 +1,20 @@ +--- netpbm-10.24/GNUmakefile.nodoc 2004-08-11 20:41:54.000000000 +0200 ++++ netpbm-10.24/GNUmakefile 2004-09-23 16:08:29.724369240 +0200 +@@ -275,16 +275,12 @@ + endif + + .PHONY: install.manweb +-install.manweb: $(PKGDIR)/man/web/netpbm.url $(PKGDIR)/bin/doc.url ++install.manweb: $(PKGDIR)/man/web/netpbm.url + + $(PKGDIR)/man/web/netpbm.url: $(PKGDIR)/man/web + echo "$(NETPBM_DOCURL)" > $@ + chmod $(INSTALL_PERM_MAN) $@ + +-$(PKGDIR)/bin/doc.url: $(PKGDIR)/bin +- echo "$(NETPBM_DOCURL)" > $@ +- chmod $(INSTALL_PERM_MAN) $@ +- + .PHONY: install-dev + # Note that you might install the development package and NOT the runtime + # package. If you have a special system for building stuff, maybe for diff --git a/netpbm.spec b/netpbm.spec index 5d37686..5e9b632 100644 --- a/netpbm.spec +++ b/netpbm.spec @@ -1,7 +1,7 @@ Summary: A library for handling different graphics file formats. Name: netpbm Version: 10.24 -Release: 2 +Release: 3 License: freeware Group: System Environment/Libraries URL: http://netpbm.sourceforge.net/ @@ -19,6 +19,7 @@ Patch9: netpbm-10.23-security.patch Patch10: netpbm-10.23-pngtopnm.patch Patch11: netpbm-10.23-malloc.patch Patch12: netpbm-10.24-misc.patch +Patch13: netpbm-10.24-nodoc.patch Buildroot: %{_tmppath}/%{name}-root BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, perl Obsoletes: libgr @@ -74,6 +75,7 @@ netpbm-progs. You'll also need to install the netpbm package. %patch10 -p1 -b .pngtopnm %patch11 -p1 -b .malloc %patch12 -p1 -b .misc +%patch13 -p1 -b .nodoc ##mv shhopt/shhopt.h shhopt/pbmshhopt.h ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile @@ -162,6 +164,9 @@ rm -rf $RPM_BUILD_ROOT/usr/pkginfo %{_mandir}/man5/* %changelog +* Thu Sep 23 2004 Jindrich Novy 10.24-3 +- added patch to suppress installation of doc.url to /usr/bin #133346 + * Wed Aug 18 2004 Jindrich Novy 10.24-2 - added patch to fix compile crash for 64bit machines - various hacks related to .security patch