From 69700915ebd408056292f94f33f3b908ad4d45defe582ed325e0fa60b6aae8d6 Mon Sep 17 00:00:00 2001 From: Mark Post Date: Mon, 19 Oct 2020 19:54:58 +0000 Subject: [PATCH] Accepting request 842631 from home:markkp:branches:hardware - Upgraded to version 2.2.1 (jsc#SLE-137116) Bug fixes: - zhypinfo: Fix memory leaks - Makefile: Various fixes - Removed obsolete qclib.makefile.libdir.patch. - Removed obsolete qclib.fix.missing.makefile.if.statement.patch. - Updated qclib.makefile.libdir.patch to fit the current version. OBS-URL: https://build.opensuse.org/request/show/842631 OBS-URL: https://build.opensuse.org/package/show/hardware/qclib?expand=0&rev=31 --- qclib-2.2.0.tgz | 3 -- qclib-2.2.1.tgz | 3 ++ qclib.changes | 11 ++++ qclib.fix.missing.makefile.if.statement.patch | 53 ------------------- qclib.makefile.libdir.patch | 31 ----------- qclib.spec | 6 +-- 6 files changed, 16 insertions(+), 91 deletions(-) delete mode 100644 qclib-2.2.0.tgz create mode 100644 qclib-2.2.1.tgz delete mode 100644 qclib.fix.missing.makefile.if.statement.patch delete mode 100644 qclib.makefile.libdir.patch diff --git a/qclib-2.2.0.tgz b/qclib-2.2.0.tgz deleted file mode 100644 index 907d4bb..0000000 --- a/qclib-2.2.0.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f8b6fe7d42f7c22a1b8edbf50b5c087f76d17e17aa0244d5a2796c3f49cd7d4 -size 93362 diff --git a/qclib-2.2.1.tgz b/qclib-2.2.1.tgz new file mode 100644 index 0000000..b496ccc --- /dev/null +++ b/qclib-2.2.1.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aff25c51a4f8a64edd3b4f5422875ffd7f773b5a25d7b5f2b7495584ed6d900d +size 93386 diff --git a/qclib.changes b/qclib.changes index f8be9be..45ff775 100644 --- a/qclib.changes +++ b/qclib.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Oct 19 17:58:26 UTC 2020 - Mark Post + +- Upgraded to version 2.2.1 (jsc#SLE-137116) + Bug fixes: + - zhypinfo: Fix memory leaks + - Makefile: Various fixes +- Removed obsolete qclib.makefile.libdir.patch. +- Removed obsolete qclib.fix.missing.makefile.if.statement.patch. +- Updated qclib.makefile.libdir.patch to fit the current version. + ------------------------------------------------------------------- Wed Sep 16 18:27:21 UTC 2020 - Mark Post diff --git a/qclib.fix.missing.makefile.if.statement.patch b/qclib.fix.missing.makefile.if.statement.patch deleted file mode 100644 index 1cb6c5b..0000000 --- a/qclib.fix.missing.makefile.if.statement.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- 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 diff --git a/qclib.makefile.libdir.patch b/qclib.makefile.libdir.patch deleted file mode 100644 index 68b4179..0000000 --- a/qclib.makefile.libdir.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- 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" -- install -Dm 644 libqc.a $(DESTDIR)/usr/lib64/libqc.a -- install -Dm 755 libqc.so.$(VERSION) $(DESTDIR)/usr/lib64/libqc.so.$(VERSION) -- ln -sr $(DESTDIR)/usr/lib64/libqc.so.$(VERSION) $(DESTDIR)/usr/lib64/libqc.so.$(VERM) -- ln -sr $(DESTDIR)/usr/lib64/libqc.so.$(VERSION) $(DESTDIR)/usr/lib64/libqc.so -+ install -Dm 644 libqc.a $(DESTDIR)/usr/$(LIBDIR)/libqc.a -+ 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)/$(DOCDIR)/qclib/README - install -Dm 644 LICENSE $(DESTDIR)/$(DOCDIR)/qclib/LICENSE diff --git a/qclib.spec b/qclib.spec index 53fcf5c..fa2f132 100644 --- a/qclib.spec +++ b/qclib.spec @@ -17,7 +17,7 @@ Name: qclib -Version: 2.2.0 +Version: 2.2.1 Release: 0 Summary: Query Capacity library License: BSD-3-Clause @@ -25,8 +25,6 @@ Group: Development/Libraries/C and C++ URL: https://public.dhe.ibm.com/software/dw/linux390/ht_src/%{name}-%{version}.tgz Source: %{name}-%{version}.tgz Source1: %{name}-rpmlintrc -Patch1: qclib.fix.missing.makefile.if.statement.patch -Patch99: qclib.makefile.libdir.patch BuildRequires: doxygen BuildRequires: gcc-c++ ExclusiveArch: s390 s390x @@ -108,7 +106,7 @@ MYCFLAGS=$(grep ^CFLAGS Makefile | cut -f2 -d=) %make_build doc test-sh %install -%make_install LIBDIR=%{_lib} V=1 +%make_install V=1 gzip -9 %{buildroot}/%{_mandir}/man8/* make installdoc DESTDIR=%{buildroot} V=1