From f9bb396ca9f76adde12f8052468a24e159b89c60 Mon Sep 17 00:00:00 2001 From: Andrey Maslennikov Date: Wed, 9 Aug 2017 09:26:19 +0000 Subject: [PATCH 1/5] rpm: add comment for ExclusiveArch and fix %changelog version --- ucx.spec.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ucx.spec.in b/ucx.spec.in index c5fd34ac857..2867fac9d3f 100644 --- a/ucx.spec.in +++ b/ucx.spec.in @@ -10,6 +10,7 @@ License: BSD URL: http://www.openucx.org Source: https://github.com/openucx/%{name}/archive/v@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.tar.gz +# UCX currently supports only the following architectures ExclusiveArch: aarch64 ppc64le x86_64 BuildRequires: numactl-devel @@ -67,5 +68,5 @@ rm -f %{buildroot}%{_libdir}/*.la %postun -p /sbin/ldconfig %changelog -* Mon Jul 3 2017 Andrey Maslennikov 1.3 +* Mon Jul 3 2017 Andrey Maslennikov 1.2.0-1 - Fedora package created From cc0d1b55b446988b8307317fad774c12dcd51976 Mon Sep 17 00:00:00 2001 From: Andrey Maslennikov Date: Thu, 10 Aug 2017 09:51:37 +0300 Subject: [PATCH 2/5] rpm: unversioned libraries should belong to -devel package --- ucx.spec.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ucx.spec.in b/ucx.spec.in index 2867fac9d3f..2444bd1d18a 100644 --- a/ucx.spec.in +++ b/ucx.spec.in @@ -51,7 +51,7 @@ make DESTDIR=%{buildroot} install rm -f %{buildroot}%{_libdir}/*.la %files -%{_libdir}/lib*.so* +%{_libdir}/lib*.so.* %{_bindir}/uc* %{_datadir}/ucx/perftest/* %doc README AUTHORS NEWS @@ -61,6 +61,7 @@ rm -f %{buildroot}%{_libdir}/*.la %files devel %{_includedir}/uc* %{_libdir}/lib*.a +%{_libdir}/lib*.so %{_libdir}/pkgconfig/ucx.pc %{_datadir}/ucx/examples From 30448c84e1366f3bbeca7d1be90acf7305a27b36 Mon Sep 17 00:00:00 2001 From: Andrey Maslennikov Date: Thu, 10 Aug 2017 15:56:14 +0300 Subject: [PATCH 3/5] rpm: add directories ownership --- ucx.spec.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ucx.spec.in b/ucx.spec.in index 2444bd1d18a..5ae19f41d82 100644 --- a/ucx.spec.in +++ b/ucx.spec.in @@ -53,7 +53,8 @@ rm -f %{buildroot}%{_libdir}/*.la %files %{_libdir}/lib*.so.* %{_bindir}/uc* -%{_datadir}/ucx/perftest/* +%{_datadir}/ucx +%exclude %{_datadir}/ucx/examples %doc README AUTHORS NEWS %{!?_licensedir:%global license %%doc} %license LICENSE From d802cbac4686f5d0a0bc5f6f35e668b7631fb2e0 Mon Sep 17 00:00:00 2001 From: Andrey Maslennikov Date: Mon, 14 Aug 2017 11:10:38 +0300 Subject: [PATCH 4/5] rpm: add libibverbs-devel to BuildRequires list --- ucx.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ucx.spec.in b/ucx.spec.in index 5ae19f41d82..e5f1efeae72 100644 --- a/ucx.spec.in +++ b/ucx.spec.in @@ -13,7 +13,7 @@ Source: https://github.com/openucx/%{name}/archive/v@MAJOR_VERSION@.@MINOR_VERSI # UCX currently supports only the following architectures ExclusiveArch: aarch64 ppc64le x86_64 -BuildRequires: numactl-devel +BuildRequires: numactl-devel libibverbs-devel BuildRequires: automake autoconf libtool %description From 9263b5a1bbd2f845b5e63804640f5c0073643976 Mon Sep 17 00:00:00 2001 From: Andrey Maslennikov Date: Thu, 10 Aug 2017 11:28:00 +0300 Subject: [PATCH 5/5] rpm: package static libraries into -static package --- ucx.spec.in | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/ucx.spec.in b/ucx.spec.in index e5f1efeae72..c3613da28b2 100644 --- a/ucx.spec.in +++ b/ucx.spec.in @@ -26,12 +26,19 @@ the following shared memory mechanisms: posix. sysv, cma, knem, xpmem. %package devel Requires: %{name}%{?_isa} = %{version}-%{release} -Provides: %{name}-static = %{version}-%{release} -Summary: Header files and libraries required to develop with ucx +Summary: Header files required to develop with UCX +Group: Development/Libraries + +%package static +Requires: %{name}-devel = %{version}-%{release} +Summary: Static libraries required to develop with UCX Group: Development/Libraries %description devel -Provides header files, static libraries and examples for developing with UCX. +Provides header files and examples for developing with UCX. + +%description static +Provides static libraries required for development with UCX. %prep %setup -q @@ -61,11 +68,13 @@ rm -f %{buildroot}%{_libdir}/*.la %files devel %{_includedir}/uc* -%{_libdir}/lib*.a %{_libdir}/lib*.so %{_libdir}/pkgconfig/ucx.pc %{_datadir}/ucx/examples +%files static +%{_libdir}/lib*.a + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig