From 1fe830515f6e6a620aa40188b4b668263daf7bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Thu, 27 May 2021 12:23:03 +0200 Subject: [PATCH] - updated to 2.3.0 (#1869549) - Resolves: #1869549 --- .gitignore | 12 ++---------- qclib-2.3.0-install.patch | 26 ++++++++++++++++++++++++++ qclib.spec | 20 +++++++++++++------- sources | 2 +- 4 files changed, 42 insertions(+), 18 deletions(-) create mode 100644 qclib-2.3.0-install.patch diff --git a/.gitignore b/.gitignore index 12f57a2..bf65e34 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,2 @@ -/qclib-1.2.0.tgz -/qclib-1.3.0.tgz -/qclib-1.3.1.tgz -/qclib-1.4.0.tgz -/qclib-1.4.1.tgz -/qclib-2.0.0.tgz -/qclib-2.0.1.tgz -/qclib-2.1.0.tgz -/qclib-2.2.0.tgz -/qclib-2.2.1.tar.gz +/qclib-*.tgz +/qclib-*.tar.gz diff --git a/qclib-2.3.0-install.patch b/qclib-2.3.0-install.patch new file mode 100644 index 0000000..b05527d --- /dev/null +++ b/qclib-2.3.0-install.patch @@ -0,0 +1,26 @@ +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 ec5d6df3..25a83d49 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 diff --git a/qclib.spec b/qclib.spec index 5faf06d..d14a139 100644 --- a/qclib.spec +++ b/qclib.spec @@ -1,12 +1,14 @@ Name: qclib -Version: 2.2.1 -Release: 3%{?dist} +Version: 2.3.0 +Release: 1%{?dist} Summary: Library for extraction of system information for Linux on z Systems License: BSD -URL: http://www.ibm.com/developerworks/linux/linux390/qclib.html -Source0: http://public.dhe.ibm.com/software/dw/linux390/ht_src/%{name}-%{version}.tar.gz +URL: https://github.com/ibm-s390-linux/qclib +Source0: https://github.com/ibm-s390-linux/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +# https://github.com/ibm-s390-linux/qclib/commit/52d9af246c1ba6e107e7bb202b4e109c3ad58470 +Patch0: qclib-2.3.0-install.patch ExclusiveArch: s390 s390x -BuildRequires: make +BuildRequires: make BuildRequires: gcc BuildRequires: glibc-static BuildRequires: doxygen @@ -53,7 +55,7 @@ make V=1 CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" %{?_smp_mflags} all %install -%make_install DOCDIR=%{_docdir} +%make_install V=1 DOCDIR=%{_docdir} make DESTDIR=%{buildroot} DOCDIR=%{_docdir} installdoc @@ -64,7 +66,7 @@ make test-sh test %files %dir %{_docdir}/%{name} %license %{_docdir}/%{name}/LICENSE -%doc %{_docdir}/%{name}/README +%doc %{_docdir}/%{name}/README.md %{_bindir}/zhypinfo %{_bindir}/zname %{_libdir}/libqc.so.* @@ -81,6 +83,10 @@ make test-sh test %changelog +* Thu Jun 03 2021 Dan Horák - 2.3.0-1 +- updated to 2.3.0 (#1869549) +- Resolves: #1869549 + * Fri Apr 16 2021 Mohan Boddu - 2.2.1-3 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 diff --git a/sources b/sources index e125714..e5f2f49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qclib-2.2.1.tar.gz) = b92418089feb7c97c7822b58df444c8bed20ff0ddf30d4fde10c2c22e347c9a0f77c24f8d8c921a862d2e548a8b2e3080b83285e04f2b13f52ac315c438afad4 +SHA512 (qclib-2.3.0.tar.gz) = 1c1a1792812741d769bc86e165f68d91fa54c4553e97049eb0469be91738824afccd4f6fe03e8651e03aa1605b60c95c75a8f29251be302b319293247f9ce95e