cleanup some RHEL5isms

This commit is contained in:
Kaleb S KEITHLEY 2015-11-23 11:42:29 -05:00
parent d87ebcfe7c
commit 4b94bf439e

View File

@ -392,6 +392,7 @@ is in user space and easily manageable.
This package provides support to FUSE based clients and includes the
glusterfsd and glusterfs binaries.
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
%package ganesha
Summary: NFS-Ganesha configuration
Group: Applications/File
@ -411,6 +412,7 @@ is in user space and easily manageable.
This package provides the configuration and related files for using
NFS-Ganesha as the NFS server using GlusterFS
%endif
%if ( 0%{!?_without_georeplication:1} )
%package geo-replication
@ -607,6 +609,10 @@ This package provides the glusterfs server daemon.
# For whatever reason, install-sh is sometimes missing. When this gets fixed,
# there is no need to run ./autogen or have a BuildRequires for automake.
[ -e 'install-sh' -o -e 'install.sh' ] || ./autogen.sh
%if ( 0%{?rhel} && 0%{?rhel} < 6 )
CFLAGS=-DUSE_INSECURE_OPENSSL
export CFLAGS
%endif
%configure \
./autogen.sh && %configure \
%{?_with_cmocka} \
@ -673,7 +679,7 @@ install -D -p -m 0644 extras/glusterd-sysconfig \
%endif
%if ( 0%{_for_fedora_koji_builds} )
%if ( 0%{?rhel} && 0%{?rhel} <= 5 )
%if ( 0%{?rhel} && 0%{?rhel} < 6 )
install -D -p -m 0755 %{SOURCE6} \
%{buildroot}%{_sysconfdir}/sysconfig/modules/glusterfs-fuse.modules
%endif
@ -711,6 +717,11 @@ EOM
rm -rf %{buildroot}/benchmarking
rm -f %{buildroot}/glusterfs-mode.el
rm -f %{buildroot}/glusterfs.vim
rm -rf %{buildroot}%{_libexecdir}/glusterfs/gfind_missing_files
rm -f %{buildroot}%{_sbindir}/gfind_missing_files
rm -rf %{buildroot}%{_sysconfdir}/ganesha
rm -rf %{buildroot}%{_libexecdir}/ganesha
rm -f %{buildroot}%{_prefix}/lib/ocf/resource.d/heartbeat/ganesha_*
%else
# make install always puts these in %%{_defaultdocdir}/%%{name} so don't
# use %%{_pkgdocdir}; that will be wrong on later Fedora distributions
@ -1106,10 +1117,13 @@ fi
%endif
%endif
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
%files ganesha
%{_sysconfdir}/ganesha/*
%dir %{_libexecdir}/ganesha
%attr(0755,-,-) %{_libexecdir}/ganesha/*
%attr(0755,-,-) %{_prefix}/lib/ocf/resource.d/heartbeat/*
%endif
%if ( 0%{!?_without_georeplication:1} )
%files geo-replication
@ -1132,7 +1146,8 @@ fi
%{_datadir}/glusterfs/scripts/generate-gfid-file.sh
%{_datadir}/glusterfs/scripts/gsync-sync-gfid
%ghost %attr(0644,-,-) %{_sharedstatedir}/glusterd/geo-replication/gsyncd_template.conf
%{_libexecdir}/glusterfs/gfind_missing_files
%dir %{_libexecdir}/glusterfs/gfind_missing_files
%{_libexecdir}/glusterfs/gfind_missing_files/*
%{_sbindir}/gfind_missing_files
%endif