Accepting request 534214 from hardware

1

OBS-URL: https://build.opensuse.org/request/show/534214
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/genwqe-tools?expand=0&rev=3

genwqe-tools.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Oct 13 14:22:00 UTC 2017 - normand@linux.vnet.ibm.com
+
+- add two patches to avoid build failures (same as fedora)
+  genwqe-user-4.0.18-install-gzFile_test.patch
+  genwqe-user-4.0.18-config.patch
+  TODO: there are still rpmlint warnings/errors to work on.
+
 -------------------------------------------------------------------
 Thu Mar  2 10:42:24 UTC 2017 - Thomas.Blume@suse.com
 

genwqe-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package genwqe-tools
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright 2015, International Business Machines
 #
 # All modifications and additions to the file contributed by third parties
@@ -15,46 +15,45 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-# zlib-devel 1.2.8 is better, but 1.2.7 should work too
-#
-# The following switch tries to take care that the distros libz.so is been taken:
-#    CONFIG_ZLIB_PATH=%{_libdir}/libz.so
-# No special libz build should be needed anymore, since we added the right
-# dependency to the spec file. We want to have a zlib-devel installed.
-# 
 
-Summary: GenWQE userspace tools
-Name:    genwqe-tools
-Version: 4.0.18
-Release: 1%{?dist}
-License: Apache-2.0
-Group: Development/Tools
-URL: https://github.com/ibm-genwqe/genwqe-user/
-Requires: zlib >= 1.2.7
-BuildRequires: zlib-devel >= 1.2.7 help2man
+
+Summary:        GenWQE userspace tools
+License:        Apache-2.0
+Group:          Development/Tools
+Name:           genwqe-tools
+Version:        4.0.18
+Release:        1%{?dist}
+Url:            https://github.com/ibm-genwqe/genwqe-user/
+Requires:       zlib >= 1.2.7
+BuildRequires:  help2man
+BuildRequires:  zlib-devel >= 1.2.7
 %ifarch ppc64le ppc64
 BuildRequires:  kernel-devel >= 4.4.21-69
 %endif
 BuildRequires:  fdupes
-BuildRoot: %{_tmppath}/%{name}-root
-ExclusiveArch: s390x ppc64le ppc64
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+ExclusiveArch:  s390x ppc64le ppc64
 #Source0: https://github.com/ibm-genwqe/genwqe-user/archive/v%{version}.tar.gz
 #for building from local git (fetched from _service)
 Source0:        genwqe-user-%{version}.tar.xz
 Source1:        %{name}-rpmlintrc
+Patch0:         genwqe-user-4.0.18-install-gzFile_test.patch
+Patch1:         genwqe-user-4.0.18-config.patch
 
 %description
 Provide a suite of utilities to manage and configure the IBM GenWQE card.
 
 %package -n genwqe-zlib
-Summary: GenWQE hardware accelerated libz
-Group: System/Libraries
+Summary:        GenWQE hardware accelerated libz
+Group:          System/Libraries
+
 %description -n genwqe-zlib
 GenWQE hardware accelerated libz and test-utilities.
 
 %package -n genwqe-vpd
-Summary: GenWQE adapter VPD tools
-Group: System/Libraries
+Summary:        GenWQE adapter VPD tools
+Group:          System/Libraries
+
 %description -n genwqe-vpd
 The genwqe-vpd package contains GenWQE adapter VPD tools.
 
@@ -68,7 +67,7 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
-%setup -q -n genwqe-user-%{version}
+%autosetup -p1 -n genwqe-user-%{version}
 
 %ifarch ppc64le ppc64
 %define libcxl "BUNDLE_LIBCXL=1"
@@ -132,6 +131,7 @@ ln -sf %{_bindir}/genwqe_gzip   %{buildroot}/%{_libdir}/genwqe/gzip
 %{_bindir}/genwqe_test_gz
 %{_bindir}/genwqe_mt_perf
 %{_bindir}/zlib_mt_perf
+%{_bindir}/gzFile_test
 
 %{_libdir}/genwqe/gunzip
 %{_libdir}/genwqe/gzip

genwqe-user-4.0.18-config.patch

@@ -0,0 +1,27 @@
+---
+ config.mk |    5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+Index: genwqe-user-4.0.18/config.mk
+===================================================================
+--- genwqe-user-4.0.18.orig/config.mk
++++ genwqe-user-4.0.18/config.mk
+@@ -19,7 +19,7 @@
+ #   V=1 means brief output
+ #   V=2 means full output
+ #
+-V		?= 1
++V		?= 2
+ CC		= $(CROSS)gcc
+ AS		= $(CROSS)as
+ LD		= $(CROSS)ld
+@@ -69,8 +69,7 @@ MAJOR_VERS=$(shell echo $(VERSION) | cut
+ 
+ PLATFORM ?= $(shell uname -i)
+ 
+-CFLAGS ?= -W -Wall -Werror -Wwrite-strings -Wextra -O2 -g \
+-	-Wmissing-prototypes # -Wstrict-prototypes -Warray-bounds
++CFLAGS ?= $(RPM_OPT_FLAGS)
+ CFLAGS += -DGIT_VERSION=\"$(VERSION)\" \
+ 	-I. -I../include -I../include/linux/uapi -D_GNU_SOURCE=1
+ 

genwqe-user-4.0.18-install-gzFile_test.patch

@@ -0,0 +1,16 @@
+---
+ tools/Makefile |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: genwqe-user-4.0.18/tools/Makefile
+===================================================================
+--- genwqe-user-4.0.18.orig/tools/Makefile
++++ genwqe-user-4.0.18/tools/Makefile
+@@ -110,6 +110,7 @@ install_gzip_tools: all
+ 	install -D -m 755 zlib_mt_perf   -T $(DESTDIR)/bin/zlib_mt_perf
+ 	install -D -m 755 genwqe_mt_perf -T $(DESTDIR)/bin/genwqe_mt_perf
+ 	install -D -m 755 genwqe_test_gz -T $(DESTDIR)/bin/genwqe_test_gz
++	install -D -m 755 gzFile_test    -T $(DESTDIR)/bin/gzFile_test
+ 
+ uninstall_gzip_tools:
+ 	$(RM) $(DESTDIR)/bin/genwqe_gzip \