From e0c579b451ca179b24f2ec693c7c3d78ccc1af9a Mon Sep 17 00:00:00 2001 From: Dan Horák Date: Jan 31 2018 09:08:22 +0000 Subject: - updated to 1.3.1 --- diff --git a/.gitignore b/.gitignore index f55a8ff..04139f6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /qclib-1.2.0.tgz /qclib-1.3.0.tgz +/qclib-1.3.1.tgz diff --git a/qclib-1.3.0-docdir.patch b/qclib-1.3.0-docdir.patch deleted file mode 100644 index ac637ab..0000000 --- a/qclib-1.3.0-docdir.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -up qclib-1.3.0/Makefile.docdir qclib-1.3.0/Makefile ---- qclib-1.3.0/Makefile.docdir 2017-10-24 07:02:42.000000000 +0200 -+++ qclib-1.3.0/Makefile 2017-12-04 14:15:08.000000000 +0100 -@@ -6,6 +6,7 @@ - # bugfix: Bugfixes only - VERSION = 1.3.0 - VERM = $(shell echo $(VERSION) | cut -d '.' -f 1) -+DOCDIR ?= /usr/share/doc/packages/ - CFLAGS ?= -g -Wall -O2 - CFILES = query_capacity.c query_capacity_data.c query_capacity_sysinfo.c query_capacity_ocf.c \ - query_capacity_hypfs.c query_capacity_sthyi.c -@@ -69,16 +70,16 @@ install: libqc.a 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 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 - - installdoc: doc - echo " INSTALLDOC" -- install -dm 755 $(DESTDIR)/usr/share/doc/packages/qclib/html -- cp -r html/* $(DESTDIR)/usr/share/doc/packages/qclib/html -- chmod 644 $(DESTDIR)/usr/share/doc/packages/qclib/html/search/* -- chmod 644 $(DESTDIR)/usr/share/doc/packages/qclib/html/* -- chmod 755 $(DESTDIR)/usr/share/doc/packages/qclib/html/search -+ install -dm 755 $(DESTDIR)/$(DOCDIR)/qclib/html -+ cp -r html/* $(DESTDIR)/$(DOCDIR)/qclib/html -+ chmod 644 $(DESTDIR)/$(DOCDIR)/qclib/html/search/* -+ chmod 644 $(DESTDIR)/$(DOCDIR)/qclib/html/* -+ chmod 755 $(DESTDIR)/$(DOCDIR)/qclib/html/search - - clean: - echo " CLEAN" diff --git a/qclib-1.3.1-docdir.patch b/qclib-1.3.1-docdir.patch new file mode 100644 index 0000000..358a1f9 --- /dev/null +++ b/qclib-1.3.1-docdir.patch @@ -0,0 +1,35 @@ +diff -up qclib-1.3.1/Makefile.docdir qclib-1.3.1/Makefile +--- qclib-1.3.1/Makefile.docdir 2017-10-24 07:02:42.000000000 +0200 ++++ qclib-1.3.1/Makefile 2017-12-04 14:15:08.000000000 +0100 +@@ -6,6 +6,7 @@ + # bugfix: Bugfixes only + VERSION = 1.3.1 + VERM = $(shell echo $(VERSION) | cut -d '.' -f 1) ++DOCDIR ?= /usr/share/doc/packages/ + CFLAGS ?= -g -Wall -O2 + CFILES = query_capacity.c query_capacity_data.c query_capacity_sysinfo.c query_capacity_ocf.c \ + query_capacity_hypfs.c query_capacity_sthyi.c +@@ -69,16 +70,16 @@ install: libqc.a 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 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 + + installdoc: doc + echo " INSTALLDOC" +- install -dm 755 $(DESTDIR)/usr/share/doc/packages/qclib/html +- cp -r html/* $(DESTDIR)/usr/share/doc/packages/qclib/html +- chmod 644 $(DESTDIR)/usr/share/doc/packages/qclib/html/search/* +- chmod 644 $(DESTDIR)/usr/share/doc/packages/qclib/html/* +- chmod 755 $(DESTDIR)/usr/share/doc/packages/qclib/html/search ++ install -dm 755 $(DESTDIR)/$(DOCDIR)/qclib/html ++ cp -r html/* $(DESTDIR)/$(DOCDIR)/qclib/html ++ chmod 644 $(DESTDIR)/$(DOCDIR)/qclib/html/search/* ++ chmod 644 $(DESTDIR)/$(DOCDIR)/qclib/html/* ++ chmod 755 $(DESTDIR)/$(DOCDIR)/qclib/html/search + + clean: + echo " CLEAN" diff --git a/qclib.spec b/qclib.spec index eb6c167..0b0f7c1 100644 --- a/qclib.spec +++ b/qclib.spec @@ -1,5 +1,5 @@ Name: qclib -Version: 1.3.0 +Version: 1.3.1 Release: 1%{?dist} Summary: Library for extraction of system information for Linux on z Systems License: BSD @@ -7,7 +7,7 @@ URL: http://www.ibm.com/developerworks/linux/linux390/qclib.html Source0: http://public.dhe.ibm.com/software/dw/linux390/ht_src/%{name}-%{version}.tgz # Soname will be set upstream in later release # https://bugzilla.redhat.com/show_bug.cgi?id=1306280 -Patch0: %{name}-1.3.0-docdir.patch +Patch0: %{name}-1.3.1-docdir.patch ExclusiveArch: s390 s390x BuildRequires: glibc-static BuildRequires: doxygen @@ -80,6 +80,9 @@ make test-sh test %{_libdir}/libqc*.a %changelog +* Wed Jan 31 2018 Dan Horák - 1.3.1-1 +- updated to 1.3.1 + * Mon Dec 04 2017 Dan Horák - 1.3.0-1 - updated to 1.3.0 diff --git a/sources b/sources index 3421ae9..609b37f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qclib-1.3.0.tgz) = aaed6ed7414da7a5d5295ad9c024cb9a9f6792339bad8917b643ed6be53ce92e1fc248c2df17cd451b87c640f6cfc8572de195884e39ff85f876ea258f6c04a1 +SHA512 (qclib-1.3.1.tgz) = 348ee71c9e56d513ef576d8d382e90a304499ffc211bc77abd78894f1357bc64d5e951ff476fa65cecbd87e8163557b0dbaeb4a15dd33ca51a0254b352e18338