upgrade netpbm to CentOS 7.5 version

Story: 2003389
Task: 24496

Change-Id: Ie06781c8e34576379df5003f451d1a9cec6f34f5
Signed-off-by: zhipengl <zhipengs.liu@intel.com>

base/netpbm/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch

@@ -1,4 +1,4 @@
-From 55b381fed1b1bae9bd0bdfabd07246f40805252e Mon Sep 17 00:00:00 2001
+From bb0bf50256fd7d85d7f6f9eeb64d621a5698cfcc Mon Sep 17 00:00:00 2001
 From: Don Penney <don.penney@windriver.com>
 Date: Tue, 27 Sep 2016 21:23:24 -0400
 Subject: [PATCH] Update package versioning for TIS format
@@ -8,18 +8,18 @@ Subject: [PATCH] Update package versioning for TIS format
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/SPECS/netpbm.spec b/SPECS/netpbm.spec
-index c10c448..74c13eb 100644
+index 02dd5f8..a4579f5 100644
 --- a/SPECS/netpbm.spec
 +++ b/SPECS/netpbm.spec
 @@ -1,7 +1,7 @@
  Summary: A library for handling different graphics file formats
  Name: netpbm
- Version: 10.61.02
+ Version: 10.79.00
--Release: 9%{?dist}
+-Release: 7%{?dist}
-+Release: 9.el7%{?_tis_dist}.%{tis_patch_ver}
++Release: 7.el7%{?_tis_dist}.%{tis_patch_ver}
  # See copyright_summary for details
  License: BSD and GPLv2 and IJG and MIT and Public Domain
  Group: System Environment/Libraries
 -- 
-1.8.3.1
+2.7.4
 

base/netpbm/centos/meta_patches/0001-remove-ghostscript.patch

@@ -1,16 +1,26 @@
+From 4d8601d4eda671c7da04f7eb438e20407f33b09b Mon Sep 17 00:00:00 2001
+From: zhipengl <zhipengs.liu@intel.com>
+Date: Wed, 22 Aug 2018 01:02:40 +0800
+Subject: 0001-remove-ghostscript.patch
+
+Signed-off-by: zhipengl <zhipengs.liu@intel.com>
+---
+ SPECS/netpbm.spec | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
 diff --git a/SPECS/netpbm.spec b/SPECS/netpbm.spec
-index c0a2d27..c10c448 100644
+index 82eafb8..02dd5f8 100644
 --- a/SPECS/netpbm.spec
 +++ b/SPECS/netpbm.spec
-@@ -40,6 +40,7 @@ Patch28: netpbm-compare-same-images.patch
+@@ -31,6 +31,7 @@ Patch15: netpbm-pamtojpeg2k.patch
- Patch29: netpbm-manual-pages.patch
+ Patch16: netpbm-manfix.patch
- Patch30: netpbm-pnmtops-hangs.patch
+ Patch17: netpbm-manual-pages.patch
- Patch31: netpbm-pgmtexture-fault.patch
+ Patch18: netpbm-ppmfadeusage.patch
-+Patch32: remove-pstopnm.patch
++Patch19: remove-pstopnm.patch
  BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
  BuildRequires: libX11-devel, python, jasper-devel, libxml2-devel
  
-@@ -66,7 +67,6 @@ to have the netpbm package installed.
+@@ -57,7 +58,6 @@ to have the netpbm package installed.
  %package progs
  Summary: Tools for manipulating graphics files in netpbm supported formats
  Group: Applications/Multimedia
@@ -18,12 +28,14 @@ index c0a2d27..c10c448 100644
  Requires: netpbm = %{version}-%{release}
  
  %description progs
+@@ -102,6 +102,7 @@ netpbm-doc.  You'll also need to install the netpbm-progs package.
+ %patch16 -p1 -b .manfix
+ %patch17 -p1 -b .manual-pages
+ %patch18 -p1 -b .ppmfadeusage
++%patch19 -p1
  
-@@ -120,6 +120,7 @@ netpbm-doc.  You'll also need to install the netpbm-progs package.
- %patch29 -p1 -b .manual-pages
- %patch30 -p1 -b .pnmtops-hangs
- %patch31 -p1 -b .pgmtexture-fault
-+%patch32 -p1
-
- sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
  rm -rf converter/other/jpeg2000/libjasper/
+ sed -i -e 's/SUBDIRS += libjasper//' converter/other/jpeg2000/Makefile
+-- 
+2.7.4
+

base/netpbm/centos/patches/remove-pstopnm.patch

@@ -1,25 +1,37 @@
-diff --git a/netpbm-10.61.02/converter/other/Makefile b/netpbm-10.61.02/converter/other/Makefile
+From ba7b88e20f58d1d549bf7eec2e7fc2fa2a229362 Mon Sep 17 00:00:00 2001
-index 746db87..02c66b4 100644
+From: zhipengl <zhipengs.liu@intel.com>
---- a/netpbm-10.61.02/converter/other/Makefile
+Date: Wed, 22 Aug 2018 00:50:54 +0800
-+++ b/netpbm-10.61.02/converter/other/Makefile
+Subject: remove-pstopnm.patch
+
+Signed-off-by: zhipengl <zhipengs.liu@intel.com>
+---
+ converter/other/Makefile | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/converter/other/Makefile b/converter/other/Makefile
+index b01f66a..6e9c84f 100644
+--- a/converter/other/Makefile
++++ b/converter/other/Makefile
 @@ -7,6 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
  
  include $(BUILDDIR)/config.mk
  
 +USE_GHOSTSCRIPT=N
- TEST_PKGCONFIG_LIBXML2 = if pkg-config libxml-2.0; then echo exists; fi
+ TEST_PKGCONFIG_LIBXML2 = if $(PKG_CONFIG) libxml-2.0; then echo exists; fi
  
  ifneq ($(shell $(TEST_PKGCONFIG_LIBXML2)),)
-@@ -134,10 +135,12 @@ BINARIES = \
+@@ -126,9 +127,11 @@ PORTBINARIES =  avstopam bmptopnm fitstopnm \
-   rasttopnm \
+ 		rasttopnm rlatopam sgitopnm sirtopnm srftopam sunicontopnm \
-   srftopam \
+ 		winicontopam xwdtopnm yuy2topam zeisstopnm
  
 +ifneq ($(USE_GHOSTSCRIPT),N)
  ifneq ($(DONT_HAVE_PROCESS_MGMT),Y)
-   PORTBINARIES += pstopnm
+   PORTBINARIES += pstopnm pnmtops
-   BINARIES += pnmtops
  endif
 +endif
  
  ifeq ($(HAVE_PNGLIB),Y)
-   BINARIES += pnmtopng pngtopam pamrgbatopng
+   PORTBINARIES += pamtopng pnmtopng pngtopam
+-- 
+2.7.4
+

base/netpbm/centos/srpm_path

@@ -1 +1 @@
-mirror:Source/netpbm-10.61.02-9.el7.src.rpm
+mirror:Source/netpbm-10.79.00-7.el7.src.rpm