From c00cda8bdd4e273aef6951d2e717f41867abe508 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Thu, 18 Feb 2010 08:21:43 +0000 Subject: [PATCH] - link against -lz (#564649) --- netpbm-lz.patch | 12 ++++++++++++ netpbm.spec | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 netpbm-lz.patch diff --git a/netpbm-lz.patch b/netpbm-lz.patch new file mode 100644 index 0000000..514995d --- /dev/null +++ b/netpbm-lz.patch @@ -0,0 +1,12 @@ +diff -up netpbm-10.47.09/converter/other/Makefile.lz netpbm-10.47.09/converter/other/Makefile +--- netpbm-10.47.09/converter/other/Makefile.lz 2010-02-18 09:09:34.000000000 +0100 ++++ netpbm-10.47.09/converter/other/Makefile 2010-02-18 09:11:04.000000000 +0100 +@@ -151,7 +151,7 @@ tifftopnm pamtotiff pnmtotiffcmyk: %: %. + ifeq ($(shell libpng-config --version),) + PNGLIB_LIBOPTS = $(shell $(LIBOPT) $(LIBOPTR) $(PNGLIB) $(ZLIB)) + else +- PNGLIB_LIBOPTS = $(shell libpng-config --ldflags) ++ PNGLIB_LIBOPTS = $(shell libpng-config --ldflags) -lz + endif + + pngtopnm pngtopam: %: %.o $(NETPBMLIB) $(LIBOPT) diff --git a/netpbm.spec b/netpbm.spec index d237e4f..e974668 100644 --- a/netpbm.spec +++ b/netpbm.spec @@ -28,6 +28,7 @@ Patch14: netpbm-svgtopam.patch Patch15: netpbm-docfix.patch Patch16: netpbm-ppmfadeusage.patch Patch17: netpbm-fiasco-overflow.patch +Patch18: netpbm-lz.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex BuildRequires: libX11-devel, python, jasper-devel @@ -86,6 +87,7 @@ netpbm-progs. You'll also need to install the netpbm package. %patch15 -p1 -b .docfix %patch16 -p1 -b .ppmfadeusage %patch17 -p1 -b .fiasco-overflow +%patch18 -p1 -b .lz sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in @@ -225,6 +227,7 @@ rm -rf $RPM_BUILD_ROOT compatible variants - fix ppmfade -h, --help options - add missing man pages +- link against -lz (#564649) * Wed Jan 27 2010 Jindrich Novy 10.47.09-2 - fix buffer overflow in pnmtofiasco