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

- update to 10.34

Browse Source 
- drop .ppmtogif, .nstring patches
- remove some overflow checks from .security patch, it's now resolved in
    the new upstream version
- don't use svgalib by default (don't compile/ship ppmsvgalib)
This commit is contained in:
Jindrich Novy 2006-06-22 14:42:51 +00:00
parent fbef92dfe9
commit c3853221d7
2 changed files with 398 additions and 412 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

803
netpbm-10.23-security.patch
View File

File diff suppressed because it is too large Load Diff

25
netpbm.spec
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.33 Version: 10.34
Release: 3 Release: 1
License: freeware License: freeware
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://netpbm.sourceforge.net/ URL: http://netpbm.sourceforge.net/
@ -22,8 +22,6 @@ Patch11: netpbm-10.29-pnmtopng.patch
Patch12: netpbm-10.30-rgbtxt.patch Patch12: netpbm-10.30-rgbtxt.patch
Patch13: netpbm-10.31-xwdfix.patch Patch13: netpbm-10.31-xwdfix.patch
Patch14: netpbm-10.33-ppmtompeg.patch Patch14: netpbm-10.33-ppmtompeg.patch
Patch15: netpbm-10.33-ppmtogif.patch
Patch16: netpbm-10.33-nstring.patch
Patch17: netpbm-10.33-multilib.patch Patch17: netpbm-10.33-multilib.patch
Buildroot: %{_tmppath}/%{name}-root Buildroot: %{_tmppath}/%{name}-root
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, perl, flex BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, perl, flex
@ -83,8 +81,6 @@ netpbm-progs. You'll also need to install the netpbm package.
%patch12 -p1 -b .rgbtxt %patch12 -p1 -b .rgbtxt
%patch13 -p1 -b .xwdfix %patch13 -p1 -b .xwdfix
%patch14 -p1 -b .ppmtompeg %patch14 -p1 -b .ppmtompeg
%patch15 -p1 -b .ppmtogif
%patch16 -p1 -b .nstring
%patch17 -p1 -b .multilib %patch17 -p1 -b .multilib
##mv shhopt/shhopt.h shhopt/pbmshhopt.h ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
@ -108,6 +104,9 @@ netpbm-progs. You'll also need to install the netpbm package.
EOF EOF
TOP=`pwd` TOP=`pwd`
@ -115,19 +114,20 @@ make \
CC=%{__cc} \ CC=%{__cc} \
CFLAGS="$RPM_OPT_FLAGS -fPIC" \ CFLAGS="$RPM_OPT_FLAGS -fPIC" \
LDFLAGS="-L$TOP/pbm -L$TOP/pgm -L$TOP/pnm -L$TOP/ppm" \ LDFLAGS="-L$TOP/pbm -L$TOP/pgm -L$TOP/pnm -L$TOP/ppm" \
LADD="-lm" LADD="-lm" \
JPEGINC_DIR=%{_includedir} \ JPEGINC_DIR=%{_includedir} \
PNGINC_DIR=%{_includedir} \ PNGINC_DIR=%{_includedir} \
TIFFINC_DIR=%{_includedir} \ TIFFINC_DIR=%{_includedir} \
JPEGLIB_DIR=%{_libdir} \ JPEGLIB_DIR=%{_libdir} \
PNGLIB_DIR=%{_libdir} \ PNGLIB_DIR=%{_libdir} \
TIFFLIB_DIR=%{_libdir} TIFFLIB_DIR=%{_libdir} \
LINUXSVGALIB="NONE"
%install %install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT
make package pkgdir=$RPM_BUILD_ROOT/usr make package pkgdir=$RPM_BUILD_ROOT/usr LINUXSVGALIB="NONE"
# Ugly hack to have libs in correct dir on 64bit archs. # Ugly hack to have libs in correct dir on 64bit archs.
mkdir -p $RPM_BUILD_ROOT%{_libdir} mkdir -p $RPM_BUILD_ROOT%{_libdir}
@ -184,6 +184,13 @@ rm -rf $RPM_BUILD_ROOT/usr/config_template
%{_mandir}/man5/* %{_mandir}/man5/*
%changelog %changelog
* Thu Jun 22 2006 Jindrich Novy <jnovy@redhat.com> 10.34-1
- update to 10.34
- drop .ppmtogif, .nstring patches
- remove some overflow checks from .security patch, it's
now resolved in the new upstream version
- don't use svgalib by default (don't compile/ship ppmsvgalib)
* Mon Jun 5 2006 Jindrich Novy <jnovy@redhat.com> 10.33-3 * Mon Jun 5 2006 Jindrich Novy <jnovy@redhat.com> 10.33-3
- fix multilib conflict (#192735) - fix multilib conflict (#192735)
- remove jbigtopnm man page - remove jbigtopnm man page