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