Requires /bin/dbus -> dbus
- quiet %post server (1312897) - syslog dependency (1310437)
This commit is contained in:
parent
e7aefb6900
commit
04588ed835
@ -169,7 +169,7 @@ Summary: Distributed File System
|
||||
%if ( 0%{_for_fedora_koji_builds} )
|
||||
Name: glusterfs
|
||||
Version: 3.7.8
|
||||
Release: 2%{?prereltag:.%{prereltag}}%{?dist}
|
||||
Release: 3%{?prereltag:.%{prereltag}}%{?dist}
|
||||
Vendor: Fedora Project
|
||||
%else
|
||||
Name: @PACKAGE_NAME@
|
||||
@ -399,7 +399,7 @@ Group: Applications/File
|
||||
|
||||
Requires: %{name}-server = %{version}-%{release}
|
||||
Requires: nfs-ganesha-gluster
|
||||
Requires: pcs, /usr/bin/dbus-send
|
||||
Requires: pcs, dbus
|
||||
|
||||
%description ganesha
|
||||
GlusterFS is a distributed file-system capable of scaling to several
|
||||
@ -438,14 +438,6 @@ This package provides support to geo-replication.
|
||||
%package libs
|
||||
Summary: GlusterFS common libraries
|
||||
Group: Applications/File
|
||||
%if ( 0%{!?_without_syslog:1} )
|
||||
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
|
||||
Requires: rsyslog-mmjsonparse
|
||||
%endif
|
||||
%if ( 0%{?rhel} && 0%{?rhel} == 6 )
|
||||
Requires: rsyslog-mmcount
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%description libs
|
||||
GlusterFS is a distributed file-system capable of scaling to several
|
||||
@ -750,23 +742,6 @@ install -D -p -m 0644 extras/glusterfs-georep-logrotate \
|
||||
%{buildroot}%{_sysconfdir}/logrotate.d/glusterfs-georep
|
||||
%endif
|
||||
|
||||
%if ( 0%{!?_without_syslog:1} )
|
||||
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
|
||||
install -D -p -m 0644 extras/gluster-rsyslog-7.2.conf \
|
||||
%{buildroot}%{_sysconfdir}/rsyslog.d/gluster.conf.example
|
||||
%endif
|
||||
|
||||
%if ( 0%{?rhel} && 0%{?rhel} == 6 )
|
||||
install -D -p -m 0644 extras/gluster-rsyslog-5.8.conf \
|
||||
%{buildroot}%{_sysconfdir}/rsyslog.d/gluster.conf.example
|
||||
%endif
|
||||
|
||||
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
|
||||
install -D -p -m 0644 extras/logger.conf.example \
|
||||
%{buildroot}%{_sysconfdir}/glusterfs/logger.conf.example
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# the rest of the ghosts
|
||||
touch %{buildroot}%{_sharedstatedir}/glusterd/glusterd.info
|
||||
touch %{buildroot}%{_sharedstatedir}/glusterd/options
|
||||
@ -819,11 +794,6 @@ rm -rf %{buildroot}
|
||||
## All %%post should be placed here and keep them sorted
|
||||
##
|
||||
%post
|
||||
%if ( 0%{!?_without_syslog:1} )
|
||||
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
|
||||
%_init_restart rsyslog
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%post api
|
||||
/sbin/ldconfig
|
||||
@ -891,7 +861,7 @@ fi
|
||||
#reload service files if firewalld running
|
||||
if $(systemctl is-active firewalld 1>/dev/null 2>&1); then
|
||||
#firewalld-filesystem is not available for rhel7, so command used for reload.
|
||||
firewall-cmd --reload
|
||||
firewall-cmd --reload 1>/dev/null 2>&1
|
||||
fi
|
||||
%endif
|
||||
|
||||
@ -943,11 +913,6 @@ fi
|
||||
##
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
%if ( 0%{!?_without_syslog:1} )
|
||||
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
|
||||
%_init_restart rsyslog
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%postun api
|
||||
/sbin/ldconfig
|
||||
@ -970,11 +935,6 @@ fi
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license COPYING-GPLV2 COPYING-LGPLV3
|
||||
%doc ChangeLog INSTALL README.md THANKS
|
||||
%if ( 0%{!?_without_syslog:1} )
|
||||
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
|
||||
%{_sysconfdir}/rsyslog.d/gluster.conf.example
|
||||
%endif
|
||||
%endif
|
||||
%{_mandir}/man8/*gluster*.8*
|
||||
%exclude %{_mandir}/man8/gluster.8*
|
||||
%dir %{_localstatedir}/log/glusterfs
|
||||
@ -1275,6 +1235,11 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Mar 4 2016 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.7.8-3
|
||||
- Requires /bin/dbus -> dbus
|
||||
- quiet %%post server (1312897)
|
||||
- syslog dependency (1310437)
|
||||
|
||||
* Fri Feb 26 2016 Niels de Vos <ndevos@redhat.com> - 3.7.8-2
|
||||
- Just run /sbin/ldconfig without arguments, not as interpreter (#1312374)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user