From 78385d312c4ca2ce9266069af84dc4bddfbf8112 Mon Sep 17 00:00:00 2001 From: Bala.FA Date: Fri, 19 Jun 2015 11:09:53 +0530 Subject: [PATCH 15/86] build: exclude libgfdb.pc conditionally This patch fixes rhel-5 build failure where libgfdb.pc is not applicable. Label: DOWNSTREAM ONLY Change-Id: Ied3978aa14ff6bd72f25eff9759e501100cb6343 Signed-off-by: Bala.FA Reviewed-on: https://code.engineering.redhat.com/gerrit/51099 Reviewed-on: https://code.engineering.redhat.com/gerrit/60141 Tested-by: Milind Changire --- glusterfs.spec.in | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index d832235..e2be3f3 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -935,6 +935,7 @@ fi %postun libs /sbin/ldconfig +%if ( 0%{?_build_server} ) %postun server /sbin/ldconfig %if (0%{?_with_firewalld:1}) @@ -944,6 +945,7 @@ if $(systemctl is-active firewalld 1>/dev/null 2>&1); then fi %endif exit 0 +%endif ##----------------------------------------------------------------------------- ## All %%files should be placed here and keep them grouped @@ -1113,8 +1115,10 @@ exit 0 %if ( 0%{!?_without_tiering:1} && 0%{?_build_server}) %{_libdir}/pkgconfig/libgfdb.pc %else +%if ( 0%{?rhel} && 0%{?rhel} >= 6 ) %exclude %{_libdir}/pkgconfig/libgfdb.pc %endif +%endif %files client-xlators %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/*.so @@ -1122,7 +1126,7 @@ exit 0 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/ganesha.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/client.so -+%if ( 0%{!?_without_extra_xlators:1} ) +%if ( 0%{!?_without_extra_xlators:1} ) %files extra-xlators %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption/rot-13.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy.so @@ -1215,12 +1219,14 @@ exit 0 %endif %if ( 0%{?_build_server} ) +%if ( 0%{!?_without_regression_tests:1} ) %files regression-tests %{_prefix}/share/glusterfs/run-tests.sh %{_prefix}/share/glusterfs/tests %exclude %{_prefix}/share/glusterfs/tests/basic/rpm.t %exclude %{_prefix}/share/glusterfs/tests/vagrant %endif +%endif %if ( 0%{?_build_server} ) %if ( 0%{!?_without_ocf:1} ) @@ -1988,6 +1994,9 @@ end * Tue Aug 18 2015 Niels de Vos - Include missing directories for glusterfind hooks scripts (#1225465) +* Fri Jun 19 2015 Bala.FA +- exclude libgfdb.pc conditionally for rhel-5 (#1233486) + * Thu Jun 18 2015 Bala.FA - add pretrans check for client-xlators, ganesha and python-gluster sub-packages (#1232641) -- 1.7.1