diff --git a/librtas-2.0.0.tar.gz b/librtas-2.0.0.tar.gz deleted file mode 100644 index f42e148..0000000 --- a/librtas-2.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4549ffa3291484142e915dc99b0abd2e25ceffd583ff78100ab02311b7ba529c -size 87549 diff --git a/librtas-2.0.1.tar.gz b/librtas-2.0.1.tar.gz new file mode 100644 index 0000000..38da84a --- /dev/null +++ b/librtas-2.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a79fd9cdb2f03e7401027fb80a07f14e29b86cc2d363126d527b211fea85d025 +size 90592 diff --git a/librtas-doc.changes b/librtas-doc.changes index e142e8d..9ece575 100644 --- a/librtas-doc.changes +++ b/librtas-doc.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Oct 10 11:41:53 UTC 2016 - jloeser@suse.com + +- version update to 2.0.1 + * Fix endianess issue in errinjct rtas call + +- added patches: + * librtas.fix_doc_path.patch + +- removed patches: + * librtas.bug-985643_open_RTAS_error_facility.patch + * librtas-failedmagic.patch + ------------------------------------------------------------------- Mon Jun 27 11:32:47 UTC 2016 - normand@linux.vnet.ibm.com diff --git a/librtas-doc.spec b/librtas-doc.spec index 41a58cd..c6b073f 100644 --- a/librtas-doc.spec +++ b/librtas-doc.spec @@ -1,7 +1,7 @@ # # spec file for package librtas-doc # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,10 +17,13 @@ Name: librtas-doc -Version: 2.0.0 +Version: 2.0.1 Release: 0 +BuildRequires: autoconf +BuildRequires: automake BuildRequires: doxygen BuildRequires: fdupes +BuildRequires: libtool Summary: Documents for librtas License: LGPL-2.1+ Group: Documentation/Other @@ -28,16 +31,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ppc ppc64 ppc64le Url: https://github.com/nfont/librtas Source0: librtas-%{version}.tar.gz -Patch: librtas-failedmagic.patch +Patch0: librtas.fix_doc_path.patch %description This package provides librtas documentation %prep %setup -n librtas-%{version} -%patch +%patch0 -p1 %build +./autogen.sh +%configure make CFLAGS="%optflags -fPIC -g -I $PWD/librtasevent_src" LIB_DIR="%{_libdir}" %{?_smp_mflags} %install diff --git a/librtas-failedmagic.patch b/librtas-failedmagic.patch deleted file mode 100644 index 9489a8d..0000000 --- a/librtas-failedmagic.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- - rules.mk | 1 - - 1 file changed, 1 deletion(-) - -Index: rules.mk -=================================================================== ---- rules.mk.orig 2014-06-25 21:37:10.000000000 +0200 -+++ rules.mk 2014-07-03 14:30:14.520695665 +0200 -@@ -111,7 +111,6 @@ INSTALL_LOG ?= $(ROOT_DIR)/install.log - # - # $1 library to examine - define is_lib64 --$(findstring 64,$(shell file $(firstword $1))) - endef - - # diff --git a/librtas.bug-985643_open_RTAS_error_facility.patch b/librtas.bug-985643_open_RTAS_error_facility.patch deleted file mode 100644 index 2a153ab..0000000 --- a/librtas.bug-985643_open_RTAS_error_facility.patch +++ /dev/null @@ -1,32 +0,0 @@ -@@ -, +, @@ ---- - librtas_src/syscall_calls.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) -Index: librtas-2.0.0/librtas_src/syscall_calls.c -=================================================================== ---- librtas-2.0.0.orig/librtas_src/syscall_calls.c -+++ librtas-2.0.0/librtas_src/syscall_calls.c -@@ -466,15 +466,20 @@ int rtas_errinjct_close(int otoken) - */ - int rtas_errinjct_open(int *otoken) - { -- __be32 be_otoken; -+ __be32 be_status; - int rc, status; - - rc = sanity_check(); - if (rc) - return rc; - -- rc = rtas_call("ibm,open-errinjct", 0, 2, &be_otoken, &status); -- *otoken = be32toh(be_otoken); -+ /* -+ * Unlike other RTAS calls, here first output parameter is otoken, -+ * not status. rtas_call converts otoken to host endianess. We -+ * have to convert status parameter. -+ */ -+ rc = rtas_call("ibm,open-errinjct", 0, 2, otoken, &be_status); -+ status = be32toh(be_status); - - dbg("(%p) = %d, %d\n", otoken, rc ? rc : status, *otoken); - return rc ? rc : status; diff --git a/librtas.changes b/librtas.changes index 7f561f9..024ab59 100644 --- a/librtas.changes +++ b/librtas.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Oct 10 11:41:53 UTC 2016 - jloeser@suse.com + +- version update to 2.0.1 + * Fix endianess issue in errinjct rtas call + +- added patches: + * librtas.fix_doc_path.patch + +- removed patches: + * librtas.bug-985643_open_RTAS_error_facility.patch + * librtas-failedmagic.patch + ------------------------------------------------------------------- Mon Jul 25 12:37:58 UTC 2016 - jloeser@suse.com diff --git a/librtas.fix_doc_path.patch b/librtas.fix_doc_path.patch new file mode 100644 index 0000000..f3d0e88 --- /dev/null +++ b/librtas.fix_doc_path.patch @@ -0,0 +1,13 @@ +Index: librtas-2.0.1/Makefile.am +=================================================================== +--- librtas-2.0.1.orig/Makefile.am ++++ librtas-2.0.1/Makefile.am +@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 + EXTRA_DIST = README COPYING.LESSER + EXTRA_DIST += doc/doxygen.rtas doc/doxygen.rtasevent Changelog + +-docdir = $(datadir)/doc/@PACKAGE@ ++docdir = $(datadir)/doc/packages/@PACKAGE@ + doc_DATA = README COPYING.LESSER + + pkgconfigdir = $(libdir)/pkgconfig diff --git a/librtas.spec b/librtas.spec index 0ea7047..33d6f55 100644 --- a/librtas.spec +++ b/librtas.spec @@ -1,7 +1,7 @@ # # spec file for package librtas # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define sover 2 Name: librtas -Version: 2.0.0 +Version: 2.0.1 Release: 0 Summary: Libraries to provide access to RTAS calls and RTAS events License: LGPL-2.1+ @@ -27,10 +27,12 @@ Group: System/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ppc ppc64 ppc64le Url: https://github.com/nfont/librtas +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool Source0: %{name}-%{version}.tar.gz Source1: baselibs.conf -Patch: librtas-failedmagic.patch -Patch1: librtas.bug-985643_open_RTAS_error_facility.patch +Patch0: librtas.fix_doc_path.patch %description The librtas shared library provides userspace with an interface through @@ -45,6 +47,7 @@ contents of RTAS events. %package devel Summary: Devel librtas files Group: Development/Libraries/C and C++ +BuildRequires: pkg-config Requires: %{name}%{sover} = %{version} %description devel @@ -74,10 +77,11 @@ contents of RTAS events. %prep %setup -q -%patch -%patch1 -p1 +%patch0 -p1 %build +./autogen.sh +%configure make CFLAGS="%optflags -fPIC -g -I $PWD/librtasevent_src" LIB_DIR="%{_libdir}" %{?_smp_mflags} %install @@ -87,6 +91,7 @@ make install DESTDIR=%buildroot LIB_DIR="%{_libdir}" rm -rf %buildroot/%_docdir /sbin/ldconfig -n %buildroot%{_libdir} chmod -x %{buildroot}%{_libdir}/*.a +rm %{buildroot}/%{_libdir}/*.la %post -n %{name}%{sover} -p /sbin/ldconfig @@ -106,9 +111,11 @@ chmod -x %{buildroot}%{_libdir}/*.a %{_includedir}/librtasevent.h %{_includedir}/librtasevent_v4.h %{_includedir}/librtasevent_v6.h +%{_libdir}/pkgconfig/*.pc %files devel-static %defattr(-,root,root) +%doc COPYING.LESSER %{_libdir}/librtas.a %{_libdir}/librtasevent.a