|
 |
cb8e9e |
From 82a8ee250b7fe7f7917b86bd75380677e3ec0156 Mon Sep 17 00:00:00 2001
|
|
|
cb8e9e |
From: Niels de Vos <ndevos@redhat.com>
|
|
|
cb8e9e |
Date: Wed, 10 Jun 2015 16:16:47 +0200
|
|
|
cb8e9e |
Subject: [PATCH 48/57] build: packaging corrections for RHEL-5
|
|
|
cb8e9e |
|
|
|
cb8e9e |
Because the RHEL-5 version of these packages do not contain the -server
|
|
|
cb8e9e |
bits, some additional changes for the .spec are needed. These changes
|
|
|
cb8e9e |
are not applicable upstream.
|
|
|
cb8e9e |
|
|
|
cb8e9e |
Label: DOWNSTREAM ONLY
|
|
|
cb8e9e |
|
|
|
cb8e9e |
BUG: 1230114
|
|
|
cb8e9e |
Change-Id: I3c4237bd986617f42b725efd75d1128a69e5dbe3
|
|
|
cb8e9e |
Signed-off-by: Niels de Vos <ndevos@redhat.com>
|
|
|
cb8e9e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/50447
|
|
|
cb8e9e |
Reviewed-by: Balamurugan Arumugam <barumuga@redhat.com>
|
|
|
cb8e9e |
---
|
|
|
cb8e9e |
glusterfs.spec.in | 18 ++++++++++--------
|
|
|
cb8e9e |
1 files changed, 10 insertions(+), 8 deletions(-)
|
|
|
cb8e9e |
|
|
|
cb8e9e |
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
|
|
cb8e9e |
index 2225f19..33d0e7e 100644
|
|
|
cb8e9e |
--- a/glusterfs.spec.in
|
|
|
cb8e9e |
+++ b/glusterfs.spec.in
|
|
|
cb8e9e |
@@ -84,6 +84,7 @@
|
|
|
cb8e9e |
%global _build_server 1
|
|
|
cb8e9e |
%else
|
|
|
cb8e9e |
%global _build_server 0
|
|
|
cb8e9e |
+%global _without_georeplication --disable-georeplication
|
|
|
cb8e9e |
%endif
|
|
|
cb8e9e |
|
|
|
cb8e9e |
%global _without_extra_xlators 1
|
|
|
cb8e9e |
@@ -969,17 +970,14 @@ fi
|
|
|
cb8e9e |
%exclude %{_sysconfdir}/ganesha/*
|
|
|
cb8e9e |
%exclude %{_libexecdir}/ganesha/*
|
|
|
cb8e9e |
%exclude %{_prefix}/lib/ocf/*
|
|
|
cb8e9e |
-# exclude geo-replication files
|
|
|
cb8e9e |
-%exclude %{_sysconfdir}/logrotate.d/glusterfs-georep
|
|
|
cb8e9e |
+# exclude incrementalapi
|
|
|
cb8e9e |
%exclude %{_libexecdir}/glusterfs/*
|
|
|
cb8e9e |
%exclude %{_sbindir}/gfind_missing_files
|
|
|
cb8e9e |
-%exclude %{_datadir}/glusterfs/scripts/get-gfid.sh
|
|
|
cb8e9e |
-%exclude %{_datadir}/glusterfs/scripts/slave-upgrade.sh
|
|
|
cb8e9e |
-%exclude %{_datadir}/glusterfs/scripts/gsync-upgrade.sh
|
|
|
cb8e9e |
-%exclude %{_datadir}/glusterfs/scripts/generate-gfid-file.sh
|
|
|
cb8e9e |
-%exclude %{_datadir}/glusterfs/scripts/gsync-sync-gfid
|
|
|
cb8e9e |
-%exclude %{_sharedstatedir}/glusterd/*
|
|
|
cb8e9e |
+%exclude %{_libexecdir}/glusterfs/glusterfind
|
|
|
cb8e9e |
+%exclude %{_bindir}/glusterfind
|
|
|
cb8e9e |
+%exclude %{_libexecdir}/glusterfs/peer_add_secret_pub
|
|
|
cb8e9e |
# exclude server files
|
|
|
cb8e9e |
+%exclude %{_sharedstatedir}/glusterd/*
|
|
|
cb8e9e |
%exclude %{_sysconfdir}/glusterfs
|
|
|
cb8e9e |
%exclude %{_sysconfdir}/glusterfs/glusterd.vol
|
|
|
cb8e9e |
%exclude %{_sysconfdir}/glusterfs/glusterfs-georep-logrotate
|
|
|
cb8e9e |
@@ -995,7 +993,9 @@ fi
|
|
|
cb8e9e |
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/arbiter.so
|
|
|
cb8e9e |
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bit-rot.so
|
|
|
cb8e9e |
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bitrot-stub.so
|
|
|
cb8e9e |
+%if ( 0%{!?_without_tiering:1} )
|
|
|
cb8e9e |
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/changetimerecorder.so
|
|
|
cb8e9e |
+%endif
|
|
|
cb8e9e |
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/index.so
|
|
|
cb8e9e |
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/locks.so
|
|
|
cb8e9e |
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/posix*
|
|
|
cb8e9e |
@@ -1008,7 +1008,9 @@ fi
|
|
|
cb8e9e |
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs*
|
|
|
cb8e9e |
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server*
|
|
|
cb8e9e |
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage*
|
|
|
cb8e9e |
+%if ( 0%{!?_without_tiering:1} )
|
|
|
cb8e9e |
%exclude %{_libdir}/libgfdb.so.*
|
|
|
cb8e9e |
+%endif
|
|
|
cb8e9e |
%exclude %{_sbindir}/gcron.py
|
|
|
cb8e9e |
%exclude %{_sbindir}/glfsheal
|
|
|
cb8e9e |
%exclude %{_sbindir}/glusterd
|
|
|
cb8e9e |
--
|
|
|
cb8e9e |
1.7.1
|
|
|
cb8e9e |
|