|
 |
e7a346 |
From 444324cfdcd8da750bc0ae04a3a416725489dd06 Mon Sep 17 00:00:00 2001
|
|
|
e7a346 |
From: "Bala.FA" <barumuga@redhat.com>
|
|
|
e7a346 |
Date: Fri, 19 Jun 2015 11:09:53 +0530
|
|
|
e7a346 |
Subject: [PATCH 15/74] build: exclude libgfdb.pc conditionally
|
|
|
e7a346 |
|
|
|
e7a346 |
This patch fixes rhel-5 build failure where libgfdb.pc is not
|
|
|
e7a346 |
applicable.
|
|
|
e7a346 |
|
|
|
e7a346 |
Label: DOWNSTREAM ONLY
|
|
|
e7a346 |
|
|
|
e7a346 |
Change-Id: Ied3978aa14ff6bd72f25eff9759e501100cb6343
|
|
|
e7a346 |
Signed-off-by: Bala.FA <barumuga@redhat.com>
|
|
|
e7a346 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/51099
|
|
|
e7a346 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/60141
|
|
|
e7a346 |
Tested-by: Milind Changire <mchangir@redhat.com>
|
|
|
e7a346 |
---
|
|
|
e7a346 |
glusterfs.spec.in | 11 ++++++++++-
|
|
|
e7a346 |
1 file changed, 10 insertions(+), 1 deletion(-)
|
|
|
e7a346 |
|
|
|
e7a346 |
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
|
|
e7a346 |
index 0d1161d..f308f37 100644
|
|
|
e7a346 |
--- a/glusterfs.spec.in
|
|
|
e7a346 |
+++ b/glusterfs.spec.in
|
|
|
e7a346 |
@@ -1058,12 +1058,14 @@ fi
|
|
|
e7a346 |
%postun libs
|
|
|
e7a346 |
/sbin/ldconfig
|
|
|
e7a346 |
|
|
|
e7a346 |
+%if ( 0%{?_build_server} )
|
|
|
e7a346 |
%postun server
|
|
|
e7a346 |
/sbin/ldconfig
|
|
|
e7a346 |
%if (0%{?_with_firewalld:1})
|
|
|
e7a346 |
%firewalld_reload
|
|
|
e7a346 |
%endif
|
|
|
e7a346 |
exit 0
|
|
|
e7a346 |
+%endif
|
|
|
e7a346 |
|
|
|
e7a346 |
##-----------------------------------------------------------------------------
|
|
|
e7a346 |
## All %%files should be placed here and keep them grouped
|
|
|
e7a346 |
@@ -1249,8 +1251,10 @@ exit 0
|
|
|
e7a346 |
%if ( 0%{!?_without_tiering:1} && 0%{?_build_server})
|
|
|
e7a346 |
%{_libdir}/pkgconfig/libgfdb.pc
|
|
|
e7a346 |
%else
|
|
|
e7a346 |
+%if ( 0%{?rhel} && 0%{?rhel} >= 6 )
|
|
|
e7a346 |
%exclude %{_libdir}/pkgconfig/libgfdb.pc
|
|
|
e7a346 |
%endif
|
|
|
e7a346 |
+%endif
|
|
|
e7a346 |
|
|
|
e7a346 |
%files client-xlators
|
|
|
e7a346 |
%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
|
|
|
e7a346 |
@@ -1259,7 +1263,7 @@ exit 0
|
|
|
e7a346 |
%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol
|
|
|
e7a346 |
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/client.so
|
|
|
e7a346 |
|
|
|
e7a346 |
-+%if ( 0%{!?_without_extra_xlators:1} )
|
|
|
e7a346 |
+%if ( 0%{!?_without_extra_xlators:1} )
|
|
|
e7a346 |
%files extra-xlators
|
|
|
e7a346 |
%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
|
|
|
e7a346 |
%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption
|
|
|
e7a346 |
@@ -1378,6 +1382,7 @@ exit 0
|
|
|
e7a346 |
%endif
|
|
|
e7a346 |
|
|
|
e7a346 |
%if ( 0%{?_build_server} )
|
|
|
e7a346 |
+%if ( 0%{!?_without_regression_tests:1} )
|
|
|
e7a346 |
%files regression-tests
|
|
|
e7a346 |
%dir %{_datadir}/glusterfs
|
|
|
e7a346 |
%{_datadir}/glusterfs/run-tests.sh
|
|
|
e7a346 |
@@ -1385,6 +1390,7 @@ exit 0
|
|
|
e7a346 |
%exclude %{_datadir}/glusterfs/tests/vagrant
|
|
|
e7a346 |
%exclude %{_datadir}/share/glusterfs/tests/basic/rpm.t
|
|
|
e7a346 |
%endif
|
|
|
e7a346 |
+%endif
|
|
|
e7a346 |
|
|
|
e7a346 |
%if ( 0%{?_build_server} )
|
|
|
e7a346 |
%if ( 0%{!?_without_ocf:1} )
|
|
|
e7a346 |
@@ -2295,6 +2301,9 @@ end
|
|
|
e7a346 |
* Tue Aug 18 2015 Niels de Vos <ndevos@redhat.com>
|
|
|
e7a346 |
- Include missing directories for glusterfind hooks scripts (#1225465)
|
|
|
e7a346 |
|
|
|
e7a346 |
+* Fri Jun 19 2015 Bala.FA <barumuga@redhat.com>
|
|
|
e7a346 |
+- exclude libgfdb.pc conditionally for rhel-5 (#1233486)
|
|
|
e7a346 |
+
|
|
|
e7a346 |
* Thu Jun 18 2015 Bala.FA <barumuga@redhat.com>
|
|
|
e7a346 |
- add pretrans check for client-xlators, ganesha and python-gluster
|
|
|
e7a346 |
sub-packages (#1232641)
|
|
|
e7a346 |
--
|
|
|
e7a346 |
1.8.3.1
|
|
|
e7a346 |
|