Accepting request 835596 from home:markkp:branches:hardware

- Upgraded to version 2.2.0 (jsc#SLE-14064) Changes: - Add new tools zname and zhypinfo Bug fixes: - KVM hosts in mixed mode LPARs indicated both, CPs and IFLs, while only CPs are actually used - Updated qclib.makefile.libdir.patch to apply against the current version, and to make sure the two new man pages go to the right directory. - Added qclib.fix.missing.makefile.if.statement.patch to correct a problem in the Makefile. - Changed spec file from "make" to "%make_build" per spec-cleaner. - Updated the URL in the spec file to point to current location of the package. OBS-URL: https://build.opensuse.org/request/show/835596 OBS-URL: https://build.opensuse.org/package/show/hardware/qclib?expand=0&rev=28
2020-09-19 17:03:21 +00:00 · 2020-09-19 17:03:21 +00:00 · a7e4abd4e6
commit a7e4abd4e6
parent b2116c3a40
6 changed files with 106 additions and 15 deletions
--- a/qclib-2.1.0.tgz
+++ b/qclib-2.1.0.tgz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b6f534bcbc496023965fa421987a0a556d72fde50f74146902022fda5d73f488
-size 88622
--- a/qclib-2.2.0.tgz
+++ b/qclib-2.2.0.tgz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8f8b6fe7d42f7c22a1b8edbf50b5c087f76d17e17aa0244d5a2796c3f49cd7d4
+size 93362
--- a/qclib.changes
+++ b/qclib.changes
@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Sep 16 18:27:21 UTC 2020 - Mark Post <mpost@suse.com>
+
+- Upgraded to version 2.2.0 (jsc#SLE-14064)
+  Changes:
+  - Add new tools zname and zhypinfo
+  Bug fixes:
+  - KVM hosts in mixed mode LPARs indicated both, CPs and IFLs, while only
+    CPs are actually used
+- Updated qclib.makefile.libdir.patch to apply against the current
+  version, and to make sure the two new man pages go to the right
+  directory.
+- Added qclib.fix.missing.makefile.if.statement.patch to correct a
+  problem in the Makefile.
+- Changed spec file from "make" to "%make_build" per spec-cleaner.
+- Updated the URL in the spec file to point to current location of
+  the package.
+
 -------------------------------------------------------------------
 Mon Apr 27 18:42:51 UTC 2020 - Mark Post <mpost@suse.com>

--- a/qclib.fix.missing.makefile.if.statement.patch
+++ b/qclib.fix.missing.makefile.if.statement.patch
@ -0,0 +1,53 @@
+--- qclib-2.2.0/Makefile	2020-09-19 00:27:40.249451093 +0200
+++ qclib-2.2.99/Makefile	2020-09-19 00:21:59.292489845 +0200
+@@ -74,50 +75,6 @@ html: $(CFILES) query_capacity.h query_c
+ 		echo "Error: 'doxygen' not installed"; \
+ 	fi
+ 
+-		cppcheck query_capacity*.[ch] 2>&1 | sed 's/^/   /'; \
+-	else \
+-		echo "cppcheck not available"; \
+-	fi
+-	@echo;
+-	-@if which smatch >/dev/null 2>&1; then \
+-		echo "Running smatch"; \
+-		smatch query_capacity*.[ch] 2>&1 | sed 's/^/   /'; \
+-	else \
+-		echo "smatch not available"; \
+-	fi
+-	@echo;
+-	-@if which sparse >/dev/null 2>&1; then \
+-		echo "Running sparse"; \
+-		sparse -Wsparse-all query_capacity*.[ch] 2>&1 | sed 's/^/   /'; \
+-	else \
+-		echo "sparse not available"; \
+-	fi
+-	@echo;
+-	-@if which valgrind >/dev/null 2>&1; then \
+-		echo "Running valgrind: qc_test"; \
+-		LD_LIBRARY_PATH=. valgrind --leak-check=full --show-leak-kinds=all ./qc_test-sh `find regtest_data -maxdepth 1 -mindepth 1 -type d | \
+-			grep -ve "^regtest_data/extras_" | sort` 2>&1 | grep -A 100 "HEAP SUMMARY:" | sed 's/^/   /'; \
+-		echo; \
+-		echo "zname: Running valgrind: zname -a"; \
+-		QC_USE_DUMP=regtest_data/dump_r3545038 LD_LIBRARY_PATH=. valgrind --leak-check=full --show-leak-kinds=all ./zname -a | \
+-			grep -A 100 "HEAP SUMMARY:" | sed 's/^/   /'; \
+-		echo; \
+-		echo "zname: Running valgrind: zhypinfo"; \
+-		QC_USE_DUMP=regtest_data/dump_r3545038 LD_LIBRARY_PATH=. valgrind --leak-check=full --show-leak-kinds=all ./zhypinfo | \
+-			grep -A 100 "HEAP SUMMARY:" | sed 's/^/   /'; \
+-		echo; \
+-		echo "zname: Running valgrind: zhypinfo -L"; \
+-		QC_USE_DUMP=regtest_data/dump_r3545038 LD_LIBRARY_PATH=. valgrind --leak-check=full --show-leak-kinds=all ./zhypinfo -L | \
+-			grep -A 100 "HEAP SUMMARY:" | sed 's/^/   /'; \
+-		echo; \
+-		echo "Running callgrind: qctest"; \
+-		LD_LIBRARY_PATH=. valgrind --callgrind-out-file=/dev/null --tool=callgrind ./zhypinfo -l `find regtest_data -maxdepth 1 -mindepth 1 -type d | \
+-			grep -ve "^regtest_data/extras_" | sort` 2>&1 | grep "refs:" | sed 's/^/   /'; \
+-	else \
+-		echo "valgrind not available"; \
+-	fi
+-	@echo;
+-
+ install: libqc.a libqc.so.$(VERSION)
+ 	echo "  INSTALL"
+ 	install -Dm 644 libqc.a $(DESTDIR)/usr/lib64/libqc.a
--- a/qclib.makefile.libdir.patch
+++ b/qclib.makefile.libdir.patch
@ -1,6 +1,14 @@
--- qclib-1.0.0/Makefile	2015-10-26 07:46:09.000000000 +0100
-+++ qclib-1.0.0/Makefile	2015-10-26 07:50:21.000000000 +0100
-@@ -64,10 +64,10 @@
+--- qclib-2.2.0/Makefile	2015-10-26 07:46:09.000000000 +0100
+++ qclib-2.2.0/Makefile	2015-10-26 07:50:21.000000000 +0100
+@@ -13,6 +13,7 @@
+ OBJECTS = $(patsubst %.c,%.o,$(CFILES))
+ .SUFFIXES: .o .c
+ DOCDIR	?= /usr/share/doc/packages/
+MANDIR	?= $(INSTALLDIR)/usr/share/man
+ 
+ ifneq ("${V}","1")
+         MAKEFLAGS += --quiet
+@@ -76,14 +77,14 @@
 
 install: libqc.a libqc.so.$(VERSION)
 	echo "  INSTALL"
@ -12,6 +20,12 @@
 +	install -Dm 755 libqc.so.$(VERSION) $(DESTDIR)/usr/$(LIBDIR)/libqc.so.$(VERSION)
 +	ln -sr $(DESTDIR)/usr/$(LIBDIR)/libqc.so.$(VERSION) $(DESTDIR)/usr/$(LIBDIR)/libqc.so.$(VERM)
 +	ln -sr $(DESTDIR)/usr/$(LIBDIR)/libqc.so.$(VERSION) $(DESTDIR)/usr/$(LIBDIR)/libqc.so
+ 	install -Dm 755 zname $(DESTDIR)/usr/bin/zname
+ 	install -Dm 755 zhypinfo $(DESTDIR)/usr/bin/zhypinfo
+-	install -Dm 644 zname.8 $(DESTDIR)/usr/share/man8/zname.8
+-	install -Dm 644 zhypinfo.8 $(DESTDIR)/usr/share/man8/zhypinfo.8
+	install -Dm 644 zname.8 $(DESTDIR)$(MANDIR)/man8/zname.8
+	install -Dm 644 zhypinfo.8 $(DESTDIR)$(MANDIR)/man8/zhypinfo.8
 	install -Dm 644 query_capacity.h $(DESTDIR)/usr/include/query_capacity.h
- 	install -Dm 644 README $(DESTDIR)/usr/share/doc/packages/qclib/README
- 	install -Dm 644 LICENSE $(DESTDIR)/usr/share/doc/packages/qclib/LICENSE
+ 	install -Dm 644 README $(DESTDIR)/$(DOCDIR)/qclib/README
+ 	install -Dm 644 LICENSE $(DESTDIR)/$(DOCDIR)/qclib/LICENSE
--- a/qclib.spec
+++ b/qclib.spec
@ -17,15 +17,16 @@


 Name:           qclib
-Version:        2.1.0
+Version:        2.2.0
 Release:        0
 Summary:        Query Capacity library
 License:        BSD-3-Clause
 Group:          Development/Libraries/C and C++
-URL:            http://www.ibm.com/developerworks/linux/linux390/qclib.html
+URL:            https://public.dhe.ibm.com/software/dw/linux390/ht_src/%{name}-%{version}.tgz
 Source:         %{name}-%{version}.tgz
 Source1:        %{name}-rpmlintrc
-Patch1:         qclib.makefile.libdir.patch
+Patch1:         qclib.fix.missing.makefile.if.statement.patch
+Patch99:        qclib.makefile.libdir.patch
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 ExclusiveArch:  s390 s390x
@ -99,15 +100,16 @@ Systems.

 %build
 MYCFLAGS=$(grep ^CFLAGS Makefile | cut -f2 -d=)
-make %{?_smp_mflags} all CFLAGS="${MYCFLAGS} %{optflags}" V=1
-make %{?_smp_mflags} doc
+%make_build all CFLAGS="${MYCFLAGS} %{optflags}"
+%make_build doc

 %check
-make %{?_smp_mflags} test
-make %{?_smp_mflags} test-sh
+%make_build doc test
+%make_build doc test-sh

 %install
 %make_install LIBDIR=%{_lib} V=1
+gzip -9 %{buildroot}/%{_mandir}/man8/*
 make installdoc DESTDIR=%{buildroot} V=1

 %post -n libqc2 -p /sbin/ldconfig
@ -117,7 +119,11 @@ make installdoc DESTDIR=%{buildroot} V=1
 %files
 %defattr(-,root,root)
 %dir %{_docdir}/%{name}
+%{_bindir}/zname
+%{_bindir}/zhypinfo
 %{_docdir}/%{name}/*
+%{_mandir}/man8/zname.8%{?ext_man}
+%{_mandir}/man8/zhypinfo.8%{?ext_man}

 %files -n libqc2
 %defattr(-,root,root)