diff --git a/.gitignore b/.gitignore index 6cb3ba8..e52a6c9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /qclib-1.3.1.tgz /qclib-1.4.0.tgz /qclib-1.4.1.tgz +/qclib-2.0.0.tgz diff --git a/qclib-1.4.1-docdir.patch b/qclib-1.4.1-docdir.patch deleted file mode 100644 index be592d0..0000000 --- a/qclib-1.4.1-docdir.patch +++ /dev/null @@ -1,35 +0,0 @@ -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.4.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-2.0.0-docdir.patch b/qclib-2.0.0-docdir.patch new file mode 100644 index 0000000..2ea9878 --- /dev/null +++ b/qclib-2.0.0-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 = 2.0.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.spec b/qclib.spec index 1aa648f..196020d 100644 --- a/qclib.spec +++ b/qclib.spec @@ -1,12 +1,12 @@ Name: qclib -Version: 1.4.1 -Release: 3%{?dist} +Version: 2.0.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}.tgz # https://bugzilla.redhat.com/show_bug.cgi?id=1306280 -Patch0: %{name}-1.4.1-docdir.patch +Patch0: %{name}-2.0.0-docdir.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1552658 Patch1: %{name}-1.3.1-ldflags.patch ExclusiveArch: s390 s390x @@ -80,6 +80,9 @@ make test-sh test %changelog +* Tue Nov 19 2019 Dan HorĂ¡k - 2.0.0-1 +- updated to 2.0.0 + * Fri Jul 26 2019 Fedora Release Engineering - 1.4.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 2b2d924..36f11dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qclib-1.4.1.tgz) = 6395bcd36d23791bd0d7cd682b93613a3b591533ad2d44d5a030ddc348a678522cce45923f22af641dd646887294936590079d5bce9c60ec7188f32e31274583 +SHA512 (qclib-2.0.0.tgz) = 257446d38becaec5a96958049651f93a81a570e8eb7d90642213a483350d72d99c3eb7d518b24787b380684efbf2347444234bcf84c6b955f5749a9fb3a910e8