rpms/netpbm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- link against -lz (#564649)

Browse Source
This commit is contained in:
Jindrich Novy 2010-02-18 08:21:43 +00:00
parent aaf502c701
commit c00cda8bdd
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
netpbm-lz.patch Normal file
View File

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

3
netpbm.spec
View File

@ -28,6 +28,7 @@ Patch14: netpbm-svgtopam.patch
Patch15: netpbm-docfix.patch Patch15: netpbm-docfix.patch
Patch16: netpbm-ppmfadeusage.patch Patch16: netpbm-ppmfadeusage.patch
Patch17: netpbm-fiasco-overflow.patch Patch17: netpbm-fiasco-overflow.patch
Patch18: netpbm-lz.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
BuildRequires: libX11-devel, python, jasper-devel 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 %patch15 -p1 -b .docfix
%patch16 -p1 -b .ppmfadeusage %patch16 -p1 -b .ppmfadeusage
%patch17 -p1 -b .fiasco-overflow %patch17 -p1 -b .fiasco-overflow
%patch18 -p1 -b .lz
sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
@ -225,6 +227,7 @@ rm -rf $RPM_BUILD_ROOT
compatible variants compatible variants
- fix ppmfade -h, --help options - fix ppmfade -h, --help options
- add missing man pages - add missing man pages
- link against -lz (#564649)
* Wed Jan 27 2010 Jindrich Novy <jnovy@redhat.com> 10.47.09-2 * Wed Jan 27 2010 Jindrich Novy <jnovy@redhat.com> 10.47.09-2
- fix buffer overflow in pnmtofiasco - fix buffer overflow in pnmtofiasco