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