rpms/glusterfs
6
0
Fork 0
Code Issues Pull Requests Releases Activity

sync with upstream glusterfs.spec.in BZ #1091392

Browse Source
This commit is contained in:
Kaleb S. KEITHLEY 2014-04-28 07:25:48 -04:00
parent 0cd8f5ac00
commit 373c16e966
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
glusterfs.spec
View File

@ -167,9 +167,6 @@ Obsoletes: hekafs
Obsoletes: %{name}-common < %{version}-%{release} Obsoletes: %{name}-common < %{version}-%{release}
Obsoletes: %{name}-core < %{version}-%{release} Obsoletes: %{name}-core < %{version}-%{release}
Obsoletes: %{name}-ufo Obsoletes: %{name}-ufo
%if ( 0%{?rhel} && 0%{?rhel} < 6 )
Obsoletes: %{name}-geo-replication = %{version}-%{release}
%endif
Provides: %{name}-common = %{version}-%{release} Provides: %{name}-common = %{version}-%{release}
Provides: %{name}-core = %{version}-%{release} Provides: %{name}-core = %{version}-%{release}
@ -320,6 +317,9 @@ Requires: rpcbind
%else %else
Requires: portmap Requires: portmap
%endif %endif
%if ( 0%{?rhel} && 0%{?rhel} < 6 )
Obsoletes: %{name}-geo-replication = %{version}-%{release}
%endif
%description server %description server
GlusterFS is a clustered file-system capable of scaling to several GlusterFS is a clustered file-system capable of scaling to several
@ -901,14 +901,6 @@ fi
%_init_enable glusterd %_init_enable glusterd
%_init_enable glusterfsd %_init_enable glusterfsd
# hack to work around old rpm/rpmbuild %%doc misfeature
%if ( 0%{?rhel} && 0%{?rhel} < 7 )
if [ -d %{_pkgdocdir}.tmp ]; then
cp -p %{_pkgdocdir}.tmp/* %{_pkgdocdir}/
rm -rf %{_pkgdocdir}.tmp/*
fi
%endif
# Genuine Fedora (and EPEL) builds never put gluster files in /etc; if # Genuine Fedora (and EPEL) builds never put gluster files in /etc; if
# there are any files in /etc from a prior gluster.org install, move them # there are any files in /etc from a prior gluster.org install, move them
# to /var/lib. (N.B. Starting with 3.3.0 all gluster files are in /var/lib # to /var/lib. (N.B. Starting with 3.3.0 all gluster files are in /var/lib