Merge remote-tracking branch 'origin' into kk-el5
This commit is contained in:
commit
ce33d530cc
@ -73,7 +73,7 @@ Summary: Cluster File System
|
||||
%if ( 0%{_for_fedora_koji_builds} )
|
||||
Name: glusterfs
|
||||
Version: 3.5.0
|
||||
Release: 0.1%{?prereltag:.%{prereltag}}%{?dist}
|
||||
Release: 0.2%{?prereltag:.%{prereltag}}%{?dist}
|
||||
Vendor: Fedora Project
|
||||
%else
|
||||
Name: @PACKAGE_NAME@
|
||||
@ -622,7 +622,6 @@ find ./tests ./run-tests.sh -type f | cpio -pd %{buildroot}%{_prefix}/share/glus
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
%if ( 0%{!?_without_syslog:1} )
|
||||
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
|
||||
%_init_restart rsyslog
|
||||
@ -630,7 +629,6 @@ rm -rf %{buildroot}
|
||||
%endif
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
%if ( 0%{!?_without_syslog:1} )
|
||||
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
|
||||
%_init_restart rsyslog
|
||||
@ -638,7 +636,7 @@ rm -rf %{buildroot}
|
||||
%endif
|
||||
|
||||
%files
|
||||
%doc ChangeLog COPYING-GPLV2 COPYING-LGPLV3 INSTALL README THANKS
|
||||
%doc ChangeLog COPYING-GPLV2 COPYING-LGPLV3 README THANKS
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/*
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/*
|
||||
%if ( 0%{!?_without_syslog:1} )
|
||||
@ -669,11 +667,9 @@ rm -rf %{buildroot}
|
||||
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/mac-compat*
|
||||
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/performance/symlink-cache*
|
||||
|
||||
%post libs
|
||||
/sbin/ldconfig
|
||||
%post libs -p /sbin/ldconfig
|
||||
|
||||
%postun libs
|
||||
/sbin/ldconfig
|
||||
%postun libs -p /sbin/ldconfig
|
||||
|
||||
%files libs
|
||||
%{_libdir}/*.so.*
|
||||
@ -787,11 +783,9 @@ fi
|
||||
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs/run
|
||||
%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid
|
||||
|
||||
%post api
|
||||
/sbin/ldconfig
|
||||
%post api -p /sbin/ldconfig
|
||||
|
||||
%postun api
|
||||
/sbin/ldconfig
|
||||
%postun api -p /sbin/ldconfig
|
||||
|
||||
%files api
|
||||
%exclude %{_libdir}/*.so
|
||||
@ -893,6 +887,10 @@ if [ $1 -ge 1 ]; then
|
||||
fi
|
||||
|
||||
%changelog
|
||||
* Thu Jan 16 2014 Ville Skyttä <ville.skytta@iki.fi> - 3.5.0-0.2beta1
|
||||
- Drop unnecessary ldconfig calls, do remaining ones without shell.
|
||||
- Drop INSTALL from docs.
|
||||
|
||||
* Wed Jan 15 2014 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.5.0-0.1beta1
|
||||
- GlusterFS 3.5.0 beta1 , glusterfs-3.5.0-0.1beta1
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user