From 20d60b6be8c13ed80f59f8813c9705ef64758ddb Mon Sep 17 00:00:00 2001 From: Scott Little Date: Wed, 1 Aug 2018 14:22:05 -0400 Subject: [PATCH] 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 --- centos_pkg_dirs | 1 - netpbm/centos/build_srpm.data | 2 -- ...te-package-versioning-for-TIS-format.patch | 25 ---------------- .../0001-remove-ghostscript.patch | 29 ------------------- netpbm/centos/meta_patches/PATCH_ORDER | 2 -- netpbm/centos/patches/remove-pstopnm.patch | 25 ---------------- netpbm/centos/srpm_path | 1 - 7 files changed, 85 deletions(-) delete mode 100644 netpbm/centos/build_srpm.data delete mode 100644 netpbm/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch delete mode 100644 netpbm/centos/meta_patches/0001-remove-ghostscript.patch delete mode 100644 netpbm/centos/meta_patches/PATCH_ORDER delete mode 100644 netpbm/centos/patches/remove-pstopnm.patch delete mode 100644 netpbm/centos/srpm_path 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 @@ iptables iscsi-initiator-utils ldapscripts -netpbm net-tools drbd-tools mariadb 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 @@ -TIS_PATCH_VER=2 -BUILD_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 @@ -From 55b381fed1b1bae9bd0bdfabd07246f40805252e Mon Sep 17 00:00:00 2001 -From: Don Penney -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 - 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 @@ -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/ 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 @@ -0001-remove-ghostscript.patch -0001-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 @@ -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 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 @@ -mirror:Source/netpbm-10.61.02-9.el7.src.rpm