- nuked the nasty upstream advertisement /usr/bin/doc.url

This commit is contained in:
Jindrich Novy 2004-09-23 14:41:03 +00:00
parent 499931c34d
commit 1f15ca55f3
2 changed files with 26 additions and 1 deletions

20
netpbm-10.24-nodoc.patch Normal file
View File

@ -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

View File

@ -1,7 +1,7 @@
Summary: A library for handling different graphics file formats. Summary: A library for handling different graphics file formats.
Name: netpbm Name: netpbm
Version: 10.24 Version: 10.24
Release: 2 Release: 3
License: freeware License: freeware
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://netpbm.sourceforge.net/ URL: http://netpbm.sourceforge.net/
@ -19,6 +19,7 @@ Patch9: netpbm-10.23-security.patch
Patch10: netpbm-10.23-pngtopnm.patch Patch10: netpbm-10.23-pngtopnm.patch
Patch11: netpbm-10.23-malloc.patch Patch11: netpbm-10.23-malloc.patch
Patch12: netpbm-10.24-misc.patch Patch12: netpbm-10.24-misc.patch
Patch13: netpbm-10.24-nodoc.patch
Buildroot: %{_tmppath}/%{name}-root Buildroot: %{_tmppath}/%{name}-root
BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, perl BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, perl
Obsoletes: libgr Obsoletes: libgr
@ -74,6 +75,7 @@ netpbm-progs. You'll also need to install the netpbm package.
%patch10 -p1 -b .pngtopnm %patch10 -p1 -b .pngtopnm
%patch11 -p1 -b .malloc %patch11 -p1 -b .malloc
%patch12 -p1 -b .misc %patch12 -p1 -b .misc
%patch13 -p1 -b .nodoc
##mv shhopt/shhopt.h shhopt/pbmshhopt.h ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile ##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/* %{_mandir}/man5/*
%changelog %changelog
* Thu Sep 23 2004 Jindrich Novy <jnovy@redhat.com> 10.24-3
- added patch to suppress installation of doc.url to /usr/bin #133346
* Wed Aug 18 2004 Jindrich Novy <jnovy@redhat.com> 10.24-2 * Wed Aug 18 2004 Jindrich Novy <jnovy@redhat.com> 10.24-2
- added patch to fix compile crash for 64bit machines - added patch to fix compile crash for 64bit machines
- various hacks related to .security patch - various hacks related to .security patch