|
 |
a3470f |
From cf8f5a4e4098a6aae9b986dc2da2006eadd4fef1 Mon Sep 17 00:00:00 2001
|
|
|
a3470f |
From: Niels de Vos <ndevos@redhat.com>
|
|
|
a3470f |
Date: Thu, 18 Jun 2015 12:16:16 +0200
|
|
|
a3470f |
Subject: [PATCH 13/74] rpm: glusterfs-devel for client-builds should not
|
|
|
a3470f |
depend on -server
|
|
|
a3470f |
|
|
|
a3470f |
glusterfs-devel for client-side packages should *not* include the
|
|
|
a3470f |
libgfdb.so symlink and libgfdb.pc file or any of the libchangelog
|
|
|
a3470f |
ones.
|
|
|
a3470f |
|
|
|
a3470f |
Label: DOWNSTREAM ONLY
|
|
|
a3470f |
|
|
|
a3470f |
Change-Id: Ifb4a9cf48841e5af5dd0a98b6de51e2ee469fc56
|
|
|
a3470f |
Signed-off-by: Niels de Vos <ndevos@redhat.com>
|
|
|
a3470f |
Reviewed-on: https://code.engineering.redhat.com/gerrit/51019
|
|
|
a3470f |
Reviewed-by: Balamurugan Arumugam <barumuga@redhat.com>
|
|
|
a3470f |
Tested-by: Balamurugan Arumugam <barumuga@redhat.com>
|
|
|
a3470f |
Reviewed-on: https://code.engineering.redhat.com/gerrit/60139
|
|
|
a3470f |
Tested-by: Milind Changire <mchangir@redhat.com>
|
|
|
a3470f |
---
|
|
|
a3470f |
glusterfs.spec.in | 24 +++++++++++++++++++-----
|
|
|
a3470f |
1 file changed, 19 insertions(+), 5 deletions(-)
|
|
|
a3470f |
|
|
|
a3470f |
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
|
|
a3470f |
index 68eba56..b2fb4d5 100644
|
|
|
a3470f |
--- a/glusterfs.spec.in
|
|
|
a3470f |
+++ b/glusterfs.spec.in
|
|
|
a3470f |
@@ -1196,9 +1196,10 @@ exit 0
|
|
|
a3470f |
%{_tmpfilesdir}/gluster.conf
|
|
|
a3470f |
%endif
|
|
|
a3470f |
%if ( ! 0%{?_build_server} )
|
|
|
a3470f |
-%{_libdir}/pkgconfig/libgfchangelog.pc
|
|
|
a3470f |
-%{_libdir}/pkgconfig/libgfdb.pc
|
|
|
a3470f |
-%{_sbindir}/gluster-setgfid2path
|
|
|
a3470f |
+%exclude %{_libdir}/pkgconfig/libgfchangelog.pc
|
|
|
a3470f |
+%exclude %{_libdir}/pkgconfig/libgfdb.pc
|
|
|
a3470f |
+%exclude %{_sbindir}/gluster-setgfid2path
|
|
|
a3470f |
+%exclude %{_mandir}/man8/gluster-setgfid2path.8*
|
|
|
a3470f |
%endif
|
|
|
a3470f |
|
|
|
a3470f |
%files api
|
|
|
a3470f |
@@ -1226,6 +1227,12 @@ exit 0
|
|
|
a3470f |
%{_includedir}/glusterfs/*
|
|
|
a3470f |
%exclude %{_includedir}/glusterfs/api
|
|
|
a3470f |
%exclude %{_libdir}/libgfapi.so
|
|
|
a3470f |
+%if ( ! 0%{?_build_server} )
|
|
|
a3470f |
+%exclude %{_libdir}/libgfchangelog.so
|
|
|
a3470f |
+%endif
|
|
|
a3470f |
+%if ( 0%{!?_without_tiering:1} && ! 0%{?_build_server})
|
|
|
a3470f |
+%exclude %{_libdir}/libgfdb.so
|
|
|
a3470f |
+%endif
|
|
|
a3470f |
%{_libdir}/*.so
|
|
|
a3470f |
# Glupy Translator examples
|
|
|
a3470f |
%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
|
|
|
a3470f |
@@ -1235,10 +1242,14 @@ exit 0
|
|
|
a3470f |
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/helloworld.*
|
|
|
a3470f |
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/negative.*
|
|
|
a3470f |
%if ( 0%{?_build_server} )
|
|
|
a3470f |
+%{_libdir}/pkgconfig/libgfchangelog.pc
|
|
|
a3470f |
+%else
|
|
|
a3470f |
%exclude %{_libdir}/pkgconfig/libgfchangelog.pc
|
|
|
a3470f |
+%endif
|
|
|
a3470f |
+%if ( 0%{!?_without_tiering:1} && 0%{?_build_server})
|
|
|
a3470f |
+%{_libdir}/pkgconfig/libgfdb.pc
|
|
|
a3470f |
+%else
|
|
|
a3470f |
%exclude %{_libdir}/pkgconfig/libgfdb.pc
|
|
|
a3470f |
-%exclude %{_sbindir}/gluster-setgfid2path
|
|
|
a3470f |
-%exclude %{_mandir}/man8/gluster-setgfid2path.8*
|
|
|
a3470f |
%endif
|
|
|
a3470f |
|
|
|
a3470f |
%files client-xlators
|
|
|
a3470f |
@@ -2161,6 +2172,9 @@ end
|
|
|
a3470f |
* Tue Aug 18 2015 Niels de Vos <ndevos@redhat.com>
|
|
|
a3470f |
- Include missing directories for glusterfind hooks scripts (#1225465)
|
|
|
a3470f |
|
|
|
a3470f |
+* Thu Jun 18 2015 Niels de Vos <ndevos@redhat.com>
|
|
|
a3470f |
+- glusterfs-devel for client-builds should not depend on -server (#1227029)
|
|
|
a3470f |
+
|
|
|
a3470f |
* Mon Jun 15 2015 Niels de Vos <ndevos@redhat.com>
|
|
|
a3470f |
- Replace hook script S31ganesha-set.sh by S31ganesha-start.sh (#1231738)
|
|
|
a3470f |
|
|
|
a3470f |
--
|
|
|
a3470f |
1.8.3.1
|
|
|
a3470f |
|