From 37a601e4630bd81df6802af9e5cae1d74db0e49c28159bc60c8f7312168fdad8 Mon Sep 17 00:00:00 2001 From: Mark Post Date: Wed, 21 Sep 2022 05:39:18 +0000 Subject: [PATCH] Accepting request 1005098 from home:markkp:branches:hardware - Upgraded to version 2.3.2 (jsc#PED-585, jsc#PED-626) * __v2.3.2 (2022-09-19)__ _Changes_: - Recognize IBM LinuxONE Emperor 4 * __v2.3.1 (2022-04-05)__ _Changes_: - Recognize IBM z16 - Removed the following obsolete patches: * qclib-sles15sp4-doc-fix-installing-README.patch. * qclib-sles15sp4-Fix-version-info.patch - Updated spec file to eliminate rpmlint warnings about self-obsoleting. - Updated rpmlintrc file to suppress an inaccurate warning about qclib-devel not depending on the correct package(s). OBS-URL: https://build.opensuse.org/request/show/1005098 OBS-URL: https://build.opensuse.org/package/show/hardware/qclib?expand=0&rev=35 --- qclib-2.3.0.tar.gz | 3 -- qclib-2.3.2.tar.gz | 3 ++ qclib-rpmlintrc | 1 + qclib-sles15sp4-Fix-version-info.patch | 26 ----------------- ...-sles15sp4-doc-fix-installing-README.patch | 29 ------------------- qclib.changes | 18 ++++++++++++ qclib.spec | 10 +++---- 7 files changed, 26 insertions(+), 64 deletions(-) delete mode 100644 qclib-2.3.0.tar.gz create mode 100644 qclib-2.3.2.tar.gz delete mode 100644 qclib-sles15sp4-Fix-version-info.patch delete mode 100644 qclib-sles15sp4-doc-fix-installing-README.patch diff --git a/qclib-2.3.0.tar.gz b/qclib-2.3.0.tar.gz deleted file mode 100644 index a98ce2e..0000000 --- a/qclib-2.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44277d0b58d836cea605db856c2cfa85463899ea77b6952f00bf2d6be855a883 -size 94033 diff --git a/qclib-2.3.2.tar.gz b/qclib-2.3.2.tar.gz new file mode 100644 index 0000000..447d285 --- /dev/null +++ b/qclib-2.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:438064e66e6a80c97bcac0b948cf496037195495ca827f399d507d3cbb92ec6e +size 94044 diff --git a/qclib-rpmlintrc b/qclib-rpmlintrc index bb61853..3ce3cee 100644 --- a/qclib-rpmlintrc +++ b/qclib-rpmlintrc @@ -4,3 +4,4 @@ addFilter("file-contains-date-and-time /usr/share/doc/packages/qclib/*") addFilter("files-duplicate /usr/share/doc/packages/qclib/html/ftv2*") addFilter("files-duplicate /usr/share/doc/packages/qclib/html/search/all_[0-4].js") addFilter("files-duplicate /usr/share/doc/packages/qclib/html/search/classes_[0-4].js") +addFilter("qclib-devel.* no-dependency-on qclib") diff --git a/qclib-sles15sp4-Fix-version-info.patch b/qclib-sles15sp4-Fix-version-info.patch deleted file mode 100644 index 0b4456f..0000000 --- a/qclib-sles15sp4-Fix-version-info.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9cbcf8a85b93f6b18ef42c2ae0ffef4c3da6244f Mon Sep 17 00:00:00 2001 -From: Stefan Raspl -Date: Mon, 28 Jun 2021 14:28:04 +0200 -Subject: [PATCH] Fix version info - -Signed-off-by: Stefan Raspl ---- - query_capacity.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/query_capacity.h b/query_capacity.h -index e8a69ed..f3bfc49 100644 ---- a/query_capacity.h -+++ b/query_capacity.h -@@ -5,7 +5,7 @@ - #ifndef QUERY_CAPACITY - #define QUERY_CAPACITY - --#define QC_VERSION "2.2.99" -+#define QC_VERSION "2.3.0" - - - /* Build Customization */ --- -2.26.2 - diff --git a/qclib-sles15sp4-doc-fix-installing-README.patch b/qclib-sles15sp4-doc-fix-installing-README.patch deleted file mode 100644 index 3e7526f..0000000 --- a/qclib-sles15sp4-doc-fix-installing-README.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9519834a61906dafa55a332c537d68af6a9e4bec Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Fri, 30 Apr 2021 09:39:39 +0200 -Subject: [PATCH] doc: fix installing README -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Dan Horák ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index ec5d6df..25a83d4 100644 ---- a/Makefile -+++ b/Makefile -@@ -88,7 +88,7 @@ install: libqc.a libqc.so.$(VERSION) zhypinfo zname - install $(INSTFLAGS) -Dm 644 zname.8 $(DESTDIR)$(MANDIR)/man8/zname.8 - install $(INSTFLAGS) -Dm 644 zhypinfo.8 $(DESTDIR)$(MANDIR)/man8/zhypinfo.8 - install $(INSTFLAGS) -Dm 644 query_capacity.h $(DESTDIR)$(INCDIR)/query_capacity.h -- install $(INSTFLAGS) -Dm 644 README $(DESTDIR)$(DOCDIR)/qclib/README -+ install $(INSTFLAGS) -Dm 644 README.md $(DESTDIR)$(DOCDIR)/qclib/README.md - install $(INSTFLAGS) -Dm 644 LICENSE $(DESTDIR)$(DOCDIR)/qclib/LICENSE - - installdoc: doc --- -2.26.2 - diff --git a/qclib.changes b/qclib.changes index e8c1b99..4337c5d 100644 --- a/qclib.changes +++ b/qclib.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Sep 20 18:29:40 UTC 2022 - Mark Post + +- Upgraded to version 2.3.2 (jsc#PED-585, jsc#PED-626) + * __v2.3.2 (2022-09-19)__ + _Changes_: + - Recognize IBM LinuxONE Emperor 4 + * __v2.3.1 (2022-04-05)__ + _Changes_: + - Recognize IBM z16 +- Removed the following obsolete patches: + * qclib-sles15sp4-doc-fix-installing-README.patch. + * qclib-sles15sp4-Fix-version-info.patch +- Updated spec file to eliminate rpmlint warnings about + self-obsoleting. +- Updated rpmlintrc file to suppress an inaccurate warning about + qclib-devel not depending on the correct package(s). + ------------------------------------------------------------------- Tue Sep 21 15:44:51 UTC 2021 - Mark Post diff --git a/qclib.spec b/qclib.spec index dc1663c..fa0fdce 100644 --- a/qclib.spec +++ b/qclib.spec @@ -1,7 +1,7 @@ # # spec file for package qclib # -# Copyright (c) 2017-2021 SUSE LLC +# Copyright (c) 2017-2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: qclib -Version: 2.3.0 +Version: 2.3.2 Release: 0 Summary: Query Capacity library License: BSD-3-Clause @@ -25,8 +25,6 @@ Group: Development/Libraries/C and C++ URL: https://github.com/ibm-s390-linux/%{name}/archive/refs/tags/%{version}.tar.gz Source: %{name}-%{version}.tar.gz Source1: %{name}-rpmlintrc -Patch1: qclib-sles15sp4-doc-fix-installing-README.patch -Patch2: qclib-sles15sp4-Fix-version-info.patch BuildRequires: doxygen BuildRequires: gcc-c++ ExclusiveArch: s390 s390x @@ -69,8 +67,8 @@ by: %package -n libqc2 Summary: Query Capacity Library shared library Group: System/Libraries -Obsoletes: libqc1 -Provides: libqc1 +Obsoletes: libqc1 <= 1.0.0 +Provides: libqc1 >= 2.0.0 %description -n libqc2 qclib provides a C API for extraction of system information for Linux on z