|
 |
e7a346 |
From b40c05f7c099e860464faddd81722c7a3ab860a4 Mon Sep 17 00:00:00 2001
|
|
|
e7a346 |
From: Niels de Vos <ndevos@redhat.com>
|
|
|
e7a346 |
Date: Wed, 10 Jun 2015 16:16:47 +0200
|
|
|
e7a346 |
Subject: [PATCH 10/74] build: packaging corrections for RHEL-5
|
|
|
e7a346 |
|
|
|
e7a346 |
Because the RHEL-5 version of these packages do not contain the -server
|
|
|
e7a346 |
bits, some additional changes for the .spec are needed. These changes
|
|
|
e7a346 |
are not applicable upstream.
|
|
|
e7a346 |
|
|
|
e7a346 |
Label: DOWNSTREAM ONLY
|
|
|
e7a346 |
|
|
|
e7a346 |
Change-Id: I3c4237bd986617f42b725efd75d1128a69e5dbe3
|
|
|
e7a346 |
Signed-off-by: Niels de Vos <ndevos@redhat.com>
|
|
|
e7a346 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/50447
|
|
|
e7a346 |
Reviewed-by: Balamurugan Arumugam <barumuga@redhat.com>
|
|
|
e7a346 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/60136
|
|
|
e7a346 |
Tested-by: Milind Changire <mchangir@redhat.com>
|
|
|
e7a346 |
---
|
|
|
e7a346 |
glusterfs.spec.in | 18 ++++++++++--------
|
|
|
e7a346 |
1 file changed, 10 insertions(+), 8 deletions(-)
|
|
|
e7a346 |
|
|
|
e7a346 |
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
|
|
e7a346 |
index 8458e8a..dbdb818 100644
|
|
|
e7a346 |
--- a/glusterfs.spec.in
|
|
|
e7a346 |
+++ b/glusterfs.spec.in
|
|
|
e7a346 |
@@ -92,6 +92,7 @@
|
|
|
e7a346 |
%global _build_server 1
|
|
|
e7a346 |
%else
|
|
|
e7a346 |
%global _build_server 0
|
|
|
e7a346 |
+%global _without_georeplication --disable-georeplication
|
|
|
e7a346 |
%endif
|
|
|
e7a346 |
|
|
|
e7a346 |
%global _without_extra_xlators 1
|
|
|
e7a346 |
@@ -1068,17 +1069,14 @@ exit 0
|
|
|
e7a346 |
%if ( ! 0%{?_build_server} )
|
|
|
e7a346 |
# exclude ganesha files
|
|
|
e7a346 |
%exclude %{_prefix}/lib/ocf/*
|
|
|
e7a346 |
-# exclude geo-replication files
|
|
|
e7a346 |
-%exclude %{_sysconfdir}/logrotate.d/glusterfs-georep
|
|
|
e7a346 |
+# exclude incrementalapi
|
|
|
e7a346 |
%exclude %{_libexecdir}/glusterfs/*
|
|
|
e7a346 |
%exclude %{_sbindir}/gfind_missing_files
|
|
|
e7a346 |
-%exclude %{_datadir}/glusterfs/scripts/get-gfid.sh
|
|
|
e7a346 |
-%exclude %{_datadir}/glusterfs/scripts/slave-upgrade.sh
|
|
|
e7a346 |
-%exclude %{_datadir}/glusterfs/scripts/gsync-upgrade.sh
|
|
|
e7a346 |
-%exclude %{_datadir}/glusterfs/scripts/generate-gfid-file.sh
|
|
|
e7a346 |
-%exclude %{_datadir}/glusterfs/scripts/gsync-sync-gfid
|
|
|
e7a346 |
-%exclude %{_sharedstatedir}/glusterd/*
|
|
|
e7a346 |
+%exclude %{_libexecdir}/glusterfs/glusterfind
|
|
|
e7a346 |
+%exclude %{_bindir}/glusterfind
|
|
|
e7a346 |
+%exclude %{_libexecdir}/glusterfs/peer_add_secret_pub
|
|
|
e7a346 |
# exclude server files
|
|
|
e7a346 |
+%exclude %{_sharedstatedir}/glusterd/*
|
|
|
e7a346 |
%exclude %{_sysconfdir}/glusterfs
|
|
|
e7a346 |
%exclude %{_sysconfdir}/glusterfs/glusterd.vol
|
|
|
e7a346 |
%exclude %{_sysconfdir}/glusterfs/glusterfs-georep-logrotate
|
|
|
e7a346 |
@@ -1093,7 +1091,9 @@ exit 0
|
|
|
e7a346 |
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/arbiter.so
|
|
|
e7a346 |
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bit-rot.so
|
|
|
e7a346 |
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bitrot-stub.so
|
|
|
e7a346 |
+%if ( 0%{!?_without_tiering:1} )
|
|
|
e7a346 |
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/changetimerecorder.so
|
|
|
e7a346 |
+%endif
|
|
|
e7a346 |
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/index.so
|
|
|
e7a346 |
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/leases.so
|
|
|
e7a346 |
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/locks.so
|
|
|
e7a346 |
@@ -1107,7 +1107,9 @@ exit 0
|
|
|
e7a346 |
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/decompounder.so
|
|
|
e7a346 |
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server*
|
|
|
e7a346 |
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage*
|
|
|
e7a346 |
+%if ( 0%{!?_without_tiering:1} )
|
|
|
e7a346 |
%exclude %{_libdir}/libgfdb.so.*
|
|
|
e7a346 |
+%endif
|
|
|
e7a346 |
%exclude %{_sbindir}/gcron.py
|
|
|
e7a346 |
%exclude %{_sbindir}/glfsheal
|
|
|
e7a346 |
%exclude %{_sbindir}/glusterd
|
|
|
e7a346 |
--
|
|
|
e7a346 |
1.8.3.1
|
|
|
e7a346 |
|