summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Little <scott.little@windriver.com>2018-08-01 14:22:05 -0400
committerScott Little <scott.little@windriver.com>2018-08-01 14:22:07 -0400
commit20d60b6be8c13ed80f59f8813c9705ef64758ddb (patch)
tree3b9c537db87aed087e343f081597a73037eb6ecb
parent8ea05fd14ae3d4bbc85ae969b69ce73449f12d87 (diff)
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: I257fb8935b2b33676781655295d13ba1356b6dd3 Story: 2002801 Task: 22687 Signed-off-by: Scott Little <scott.little@windriver.com>
Notes
Notes (review): Code-Review+2: Don Penney <don.penney@windriver.com> Code-Review+2: Saul Wold <sgw@linux.intel.com> Workflow+1: Scott Little <scott.little@windriver.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 02 Aug 2018 19:08:23 +0000 Reviewed-on: https://review.openstack.org/587963 Project: openstack/stx-gplv2 Branch: refs/heads/master
-rw-r--r--centos_pkg_dirs1
-rw-r--r--netpbm/centos/build_srpm.data2
-rw-r--r--netpbm/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch25
-rw-r--r--netpbm/centos/meta_patches/0001-remove-ghostscript.patch29
-rw-r--r--netpbm/centos/meta_patches/PATCH_ORDER2
-rw-r--r--netpbm/centos/patches/remove-pstopnm.patch25
-rw-r--r--netpbm/centos/srpm_path1
7 files changed, 0 insertions, 85 deletions
diff --git a/centos_pkg_dirs b/centos_pkg_dirs
index 0418dfb..32ec8a8 100644
--- a/centos_pkg_dirs
+++ b/centos_pkg_dirs
@@ -1,7 +1,6 @@
1iptables 1iptables
2iscsi-initiator-utils 2iscsi-initiator-utils
3ldapscripts 3ldapscripts
4netpbm
5net-tools 4net-tools
6drbd-tools 5drbd-tools
7mariadb 6mariadb
diff --git a/netpbm/centos/build_srpm.data b/netpbm/centos/build_srpm.data
deleted file mode 100644
index d189335..0000000
--- a/netpbm/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
1TIS_PATCH_VER=2
2BUILD_IS_SLOW=3
diff --git a/netpbm/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/netpbm/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
deleted file mode 100644
index cd6e5c8..0000000
--- a/netpbm/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From 55b381fed1b1bae9bd0bdfabd07246f40805252e Mon Sep 17 00:00:00 2001
2From: Don Penney <don.penney@windriver.com>
3Date: Tue, 27 Sep 2016 21:23:24 -0400
4Subject: [PATCH] Update package versioning for TIS format
5
6---
7 SPECS/netpbm.spec | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
9
10diff --git a/SPECS/netpbm.spec b/SPECS/netpbm.spec
11index c10c448..74c13eb 100644
12--- a/SPECS/netpbm.spec
13+++ b/SPECS/netpbm.spec
14@@ -1,7 +1,7 @@
15 Summary: A library for handling different graphics file formats
16 Name: netpbm
17 Version: 10.61.02
18-Release: 9%{?dist}
19+Release: 9.el7%{?_tis_dist}.%{tis_patch_ver}
20 # See copyright_summary for details
21 License: BSD and GPLv2 and IJG and MIT and Public Domain
22 Group: System Environment/Libraries
23--
241.8.3.1
25
diff --git a/netpbm/centos/meta_patches/0001-remove-ghostscript.patch b/netpbm/centos/meta_patches/0001-remove-ghostscript.patch
deleted file mode 100644
index 59234fc..0000000
--- a/netpbm/centos/meta_patches/0001-remove-ghostscript.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1diff --git a/SPECS/netpbm.spec b/SPECS/netpbm.spec
2index c0a2d27..c10c448 100644
3--- a/SPECS/netpbm.spec
4+++ b/SPECS/netpbm.spec
5@@ -40,6 +40,7 @@ Patch28: netpbm-compare-same-images.patch
6 Patch29: netpbm-manual-pages.patch
7 Patch30: netpbm-pnmtops-hangs.patch
8 Patch31: netpbm-pgmtexture-fault.patch
9+Patch32: remove-pstopnm.patch
10 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
11 BuildRequires: libX11-devel, python, jasper-devel, libxml2-devel
12
13@@ -66,7 +67,6 @@ to have the netpbm package installed.
14 %package progs
15 Summary: Tools for manipulating graphics files in netpbm supported formats
16 Group: Applications/Multimedia
17-Requires: ghostscript
18 Requires: netpbm = %{version}-%{release}
19
20 %description progs
21
22@@ -120,6 +120,7 @@ netpbm-doc. You'll also need to install the netpbm-progs package.
23 %patch29 -p1 -b .manual-pages
24 %patch30 -p1 -b .pnmtops-hangs
25 %patch31 -p1 -b .pgmtexture-fault
26+%patch32 -p1
27
28 sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
29 rm -rf converter/other/jpeg2000/libjasper/
diff --git a/netpbm/centos/meta_patches/PATCH_ORDER b/netpbm/centos/meta_patches/PATCH_ORDER
deleted file mode 100644
index b0754a0..0000000
--- a/netpbm/centos/meta_patches/PATCH_ORDER
+++ /dev/null
@@ -1,2 +0,0 @@
10001-remove-ghostscript.patch
20001-Update-package-versioning-for-TIS-format.patch
diff --git a/netpbm/centos/patches/remove-pstopnm.patch b/netpbm/centos/patches/remove-pstopnm.patch
deleted file mode 100644
index 5c4cb89..0000000
--- a/netpbm/centos/patches/remove-pstopnm.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1diff --git a/netpbm-10.61.02/converter/other/Makefile b/netpbm-10.61.02/converter/other/Makefile
2index 746db87..02c66b4 100644
3--- a/netpbm-10.61.02/converter/other/Makefile
4+++ b/netpbm-10.61.02/converter/other/Makefile
5@@ -7,6 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
6
7 include $(BUILDDIR)/config.mk
8
9+USE_GHOSTSCRIPT=N
10 TEST_PKGCONFIG_LIBXML2 = if pkg-config libxml-2.0; then echo exists; fi
11
12 ifneq ($(shell $(TEST_PKGCONFIG_LIBXML2)),)
13@@ -134,10 +135,12 @@ BINARIES = \
14 rasttopnm \
15 srftopam \
16
17+ifneq ($(USE_GHOSTSCRIPT),N)
18 ifneq ($(DONT_HAVE_PROCESS_MGMT),Y)
19 PORTBINARIES += pstopnm
20 BINARIES += pnmtops
21 endif
22+endif
23
24 ifeq ($(HAVE_PNGLIB),Y)
25 BINARIES += pnmtopng pngtopam pamrgbatopng
diff --git a/netpbm/centos/srpm_path b/netpbm/centos/srpm_path
deleted file mode 100644
index 4349e3d..0000000
--- a/netpbm/centos/srpm_path
+++ /dev/null
@@ -1 +0,0 @@
1mirror:Source/netpbm-10.61.02-9.el7.src.rpm