From 8e5a99addc206ebf6e328e0c1089ddafe4e18dff Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 18 Jun 2015 12:16:16 +0200 Subject: [PATCH 094/101] rpm: glusterfs-devel for client-builds should not depend on -server glusterfs-devel for client-side packages should *not* include the libgfdb.so symlink and libgfdb.pc file or any of the libchangelog ones. Label: DOWNSTREAM ONLY Change-Id: Ifb4a9cf48841e5af5dd0a98b6de51e2ee469fc56 BUG: 1227029 Signed-off-by: Niels de Vos Reviewed-on: https://code.engineering.redhat.com/gerrit/51019 Reviewed-by: Balamurugan Arumugam Tested-by: Balamurugan Arumugam --- glusterfs.spec.in | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 29a1ac4..388c28c 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -1113,14 +1113,26 @@ fi %exclude %{_includedir}/glusterfs/y.tab.h %exclude %{_includedir}/glusterfs/api %exclude %{_libdir}/libgfapi.so +%if ( ! 0%{?_build_server} ) +%exclude %{_libdir}/libgfchangelog.so +%endif +%if ( 0%{!?_without_tiering:1} && ! 0%{?_build_server}) +%exclude %{_libdir}/libgfdb.so +%endif %{_libdir}/*.so # Glupy Translator examples %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/debug-trace.* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/helloworld.* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/negative.* +%if ( 0%{?_build_server} ) %{_libdir}/pkgconfig/libgfchangelog.pc -%if ( 0%{!?_without_tiering:1} ) +%else +%exclude %{_libdir}/pkgconfig/libgfchangelog.pc +%endif +%if ( 0%{!?_without_tiering:1} && 0%{?_build_server}) %{_libdir}/pkgconfig/libgfdb.pc +%else +%exclude %{_libdir}/pkgconfig/libgfdb.pc %endif %files client-xlators @@ -1793,6 +1805,9 @@ end %endif %changelog +* Thu Jun 18 2015 Niels de Vos +- glusterfs-devel for client-builds should not depend on -server (#1227029) + * Fri Jun 12 2015 Aravinda VK - Added rsync as dependency to georeplication rpm (#1231213) -- 1.7.1