Relocate netpbm to stx-integ/base/netpbm

Move content from stx-gplv2 into stx-integ

Packages will be relocated to

stx-integ:
    base/
        bash
        cgcs-users
        cluster-resource-agents
        dpkg
        haproxy
        libfdt
        netpbm
        rpm

    database/
        mariadb

    filesystem/
        iscsi-initiator-utils

    filesystem/drbd/
        drbd-tools

    kernel/kernel-modules/
        drbd
        integrity
        intel-e1000e
        intel-i40e
        intel-i40evf
        intel-ixgbe
        intel-ixgbevf
        qat17
        tpmdd

    ldap/
        ldapscripts

    networking/
        iptables
        net-tools

Change-Id: I8b10c77b14fd50c8dea77a7fbeb3b3e82d101f20
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
This commit is contained in:
Scott Little 2018-08-01 14:22:09 -04:00
parent ad4ba94235
commit b5e0d0cbe9
7 changed files with 85 additions and 0 deletions

View File

@ -0,0 +1,2 @@
TIS_PATCH_VER=2
BUILD_IS_SLOW=3

View File

@ -0,0 +1,25 @@
From 55b381fed1b1bae9bd0bdfabd07246f40805252e 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
---
SPECS/netpbm.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/netpbm.spec b/SPECS/netpbm.spec
index c10c448..74c13eb 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
-Release: 9%{?dist}
+Release: 9.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

View File

@ -0,0 +1,29 @@
diff --git a/SPECS/netpbm.spec b/SPECS/netpbm.spec
index c0a2d27..c10c448 100644
--- a/SPECS/netpbm.spec
+++ b/SPECS/netpbm.spec
@@ -40,6 +40,7 @@ Patch28: netpbm-compare-same-images.patch
Patch29: netpbm-manual-pages.patch
Patch30: netpbm-pnmtops-hangs.patch
Patch31: netpbm-pgmtexture-fault.patch
+Patch32: 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.
%package progs
Summary: Tools for manipulating graphics files in netpbm supported formats
Group: Applications/Multimedia
-Requires: ghostscript
Requires: netpbm = %{version}-%{release}
%description progs
@@ -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/

View File

@ -0,0 +1,2 @@
0001-remove-ghostscript.patch
0001-Update-package-versioning-for-TIS-format.patch

View File

@ -0,0 +1,25 @@
diff --git a/netpbm-10.61.02/converter/other/Makefile b/netpbm-10.61.02/converter/other/Makefile
index 746db87..02c66b4 100644
--- a/netpbm-10.61.02/converter/other/Makefile
+++ b/netpbm-10.61.02/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
ifneq ($(shell $(TEST_PKGCONFIG_LIBXML2)),)
@@ -134,10 +135,12 @@ BINARIES = \
rasttopnm \
srftopam \
+ifneq ($(USE_GHOSTSCRIPT),N)
ifneq ($(DONT_HAVE_PROCESS_MGMT),Y)
PORTBINARIES += pstopnm
BINARIES += pnmtops
endif
+endif
ifeq ($(HAVE_PNGLIB),Y)
BINARIES += pnmtopng pngtopam pamrgbatopng

View File

@ -0,0 +1 @@
mirror:Source/netpbm-10.61.02-9.el7.src.rpm

View File

@ -132,3 +132,4 @@ base/cluster-resource-agents
base/libfdt
base/bash
base/haproxy
base/netpbm