diff --git a/.gitignore b/.gitignore index 7a53b0d..539df09 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qclib-2.2.1.tar.gz +SOURCES/qclib-2.3.0.tar.gz diff --git a/.qclib.metadata b/.qclib.metadata index 09b1f4b..6196139 100644 --- a/.qclib.metadata +++ b/.qclib.metadata @@ -1 +1 @@ -3ad53d7edd10e47125687e4e6023c0f11fc9e3e9 SOURCES/qclib-2.2.1.tar.gz +38deeebe399c920165241c5835b4308d052bcf20 SOURCES/qclib-2.3.0.tar.gz diff --git a/SOURCES/qclib-2.3.0-install.patch b/SOURCES/qclib-2.3.0-install.patch new file mode 100644 index 0000000..b05527d --- /dev/null +++ b/SOURCES/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/SPECS/qclib.spec b/SPECS/qclib.spec index dddff3f..cd8444a 100644 --- a/SPECS/qclib.spec +++ b/SPECS/qclib.spec @@ -1,10 +1,12 @@ Name: qclib -Version: 2.2.1 +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: gcc BuildRequires: glibc-static @@ -52,7 +54,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 @@ -63,7 +65,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.* @@ -80,6 +82,10 @@ make test-sh test %changelog +* Wed Jun 02 2021 Dan Horák - 2.3.0-1 +- updated to 2.3.0 (#1919242) +- Resolves: #1919242 + * Fri Oct 16 2020 Dan Horák - 2.2.1-1 - updated to 2.2.1 (#1847431) - Resolves: #1847431