From 5897227aa6dfaf67b40f250bf8e2fb0f75d441669d8633992495852e96212e87 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 27 Jun 2016 12:17:22 +0000 Subject: [PATCH] Accepting request 404975 from home:michel_mno:branches:devel:libraries:c_c++ - version update to 2.0.0 (bsc#981294) * SO version change from 1 -> 2 * generate static libraries * minor fixes (see Changelog) This is a merge of package from SUSE:SLE-12-SP2:GA (and Leap 42.2) and the doc split already present in this devel project. OBS-URL: https://build.opensuse.org/request/show/404975 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/librtas?expand=0&rev=39 --- baselibs.conf | 2 +- librtas-1.4.0.tar.gz | 3 --- librtas-2.0.0.tar.gz | 3 +++ librtas-doc.changes | 8 ++++++++ librtas-doc.spec | 2 +- librtas.changes | 8 ++++++++ librtas.spec | 37 ++++++++++++++++++++++++++++--------- 7 files changed, 49 insertions(+), 14 deletions(-) delete mode 100644 librtas-1.4.0.tar.gz create mode 100644 librtas-2.0.0.tar.gz diff --git a/baselibs.conf b/baselibs.conf index 08666ae..942a508 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -librtas1 +librtas2 diff --git a/librtas-1.4.0.tar.gz b/librtas-1.4.0.tar.gz deleted file mode 100644 index b8ec6bb..0000000 --- a/librtas-1.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7964adb5eb64a8864db08a39e13d6fa886d73e9015d02779b0f4078d2f45916e -size 89041 diff --git a/librtas-2.0.0.tar.gz b/librtas-2.0.0.tar.gz new file mode 100644 index 0000000..f42e148 --- /dev/null +++ b/librtas-2.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4549ffa3291484142e915dc99b0abd2e25ceffd583ff78100ab02311b7ba529c +size 87549 diff --git a/librtas-doc.changes b/librtas-doc.changes index df3ec9f..e142e8d 100644 --- a/librtas-doc.changes +++ b/librtas-doc.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jun 27 11:32:47 UTC 2016 - normand@linux.vnet.ibm.com + +- version update to 2.0.0 (bsc#981294) + * SO version change from 1 -> 2 + * generate static libraries + * minor fixes (see Changelog) + ------------------------------------------------------------------- Mon Jun 13 12:03:11 UTC 2016 - mlin@suse.com diff --git a/librtas-doc.spec b/librtas-doc.spec index ebdab1d..60b247c 100644 --- a/librtas-doc.spec +++ b/librtas-doc.spec @@ -17,7 +17,7 @@ Name: librtas-doc -Version: 1.4.0 +Version: 2.0.0 Release: 0 BuildRequires: doxygen BuildRequires: fdupes diff --git a/librtas.changes b/librtas.changes index df3ec9f..e142e8d 100644 --- a/librtas.changes +++ b/librtas.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jun 27 11:32:47 UTC 2016 - normand@linux.vnet.ibm.com + +- version update to 2.0.0 (bsc#981294) + * SO version change from 1 -> 2 + * generate static libraries + * minor fixes (see Changelog) + ------------------------------------------------------------------- Mon Jun 13 12:03:11 UTC 2016 - mlin@suse.com diff --git a/librtas.spec b/librtas.spec index ce26ef3..c96a1f9 100644 --- a/librtas.spec +++ b/librtas.spec @@ -16,8 +16,10 @@ # +%define sover 2 + Name: librtas -Version: 1.4.0 +Version: 2.0.0 Release: 0 Summary: Libraries to provide access to RTAS calls and RTAS events License: LGPL-2.1+ @@ -29,7 +31,7 @@ Source0: %{name}-%{version}.tar.gz Source1: baselibs.conf Patch: librtas-failedmagic.patch -%description +%description The librtas shared library provides userspace with an interface through which certain RTAS calls can be made. The library uses either of the RTAS User Module or the RTAS system call to direct the kernel in making @@ -42,16 +44,24 @@ contents of RTAS events. %package devel Summary: Devel librtas files Group: Development/Libraries/C and C++ -Requires: librtas1 = %{version} +Requires: %{name}%{sover} = %{version} %description devel This package provides devel files of librtas -%package -n librtas1 +%package devel-static +Summary: Static librtas files +Group: Development/Libraries/C and C++ +Requires: %{name}%{sover} = %{version} + +%description devel-static +This package provides devel files of librtas + +%package -n %{name}%{sover} Summary: Libraries to provide access to RTAS calls and RTAS events Group: System/Libraries -%description -n librtas1 +%description -n %{name}%{sover} The librtas shared library provides userspace with an interface through which certain RTAS calls can be made. The library uses either of the RTAS User Module or the RTAS system call to direct the kernel in making @@ -74,12 +84,13 @@ make install DESTDIR=%buildroot LIB_DIR="%{_libdir}" # documents are in -doc subpackage rm -rf %buildroot/%_docdir /sbin/ldconfig -n %buildroot%{_libdir} +chmod -x %{buildroot}%{_libdir}/*.a -%post -n librtas1 -p /sbin/ldconfig +%post -n %{name}%{sover} -p /sbin/ldconfig -%postun -n librtas1 -p /sbin/ldconfig +%postun -n %{name}%{sover} -p /sbin/ldconfig -%files -n librtas1 +%files -n %{name}%{sover} %defattr(-, root, root) %doc COPYING.LESSER Changelog README %{_libdir}/lib*.so.* @@ -87,8 +98,16 @@ rm -rf %buildroot/%_docdir %files devel %defattr(-, root, root) %doc COPYING.LESSER -/usr/include/* %{_libdir}/librtasevent.so %{_libdir}/librtas.so +%{_includedir}/librtas.h +%{_includedir}/librtasevent.h +%{_includedir}/librtasevent_v4.h +%{_includedir}/librtasevent_v6.h + +%files devel-static +%defattr(-,root,root) +%{_libdir}/librtas.a +%{_libdir}/librtasevent.a %changelog