diff --git a/glusterfs.spec b/glusterfs.spec index 3534c75..305ddb2 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -168,13 +168,13 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 3.7.7 -Release: 2%{?prereltag:.%{prereltag}}%{?dist} +Version: 3.7.8 +Release: 1%{?prereltag:.%{prereltag}}%{?dist} Vendor: Fedora Project %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ -Release: 0.@PACKAGE_RELEASE@%{?dist}.2 +Release: 0.@PACKAGE_RELEASE@%{?dist}.1 Vendor: Gluster Community %endif License: GPLv2 or LGPLv3+ @@ -399,7 +399,7 @@ Group: Applications/File Requires: %{name}-server = %{version}-%{release} Requires: nfs-ganesha-gluster -Requires: pcs +Requires: pcs, /usr/bin/dbus-send %description ganesha GlusterFS is a distributed file-system capable of scaling to several @@ -528,13 +528,9 @@ License: GPLv3+ BuildArch: noarch %endif # this Group handling comes from the Fedora resource-agents package -%if ( 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} ) Group: System Environment/Base -%else -Group: Productivity/Clustering/HA -%endif # for glusterd -Requires: %{name}-server +Requires: %{name}-server = %{version}-%{release} # depending on the distribution, we need pacemaker or resource-agents Requires: %{_prefix}/lib/ocf/resource.d @@ -778,21 +774,12 @@ mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1 mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/stop mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/stop/post -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/stop/pre mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/start -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/start/post mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/start/pre -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/reset -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/reset/post -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/reset/pre mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/remove-brick mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/remove-brick/post mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/remove-brick/pre -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/add-brick -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/add-brick/post -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/add-brick/pre mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/set -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/set/post mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/set/pre mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/create mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/create/post @@ -813,25 +800,12 @@ mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/nfs/run touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/nfs-server.vol touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/run/nfs.pid -%{__install} -p -m 0744 extras/hook-scripts/start/post/*.sh \ - %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/start/post -%{__install} -p -m 0744 extras/hook-scripts/stop/pre/*.sh \ - %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/stop/pre -%{__install} -p -m 0744 extras/hook-scripts/set/post/*.sh \ - %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/set/post -%{__install} -p -m 0744 extras/hook-scripts/add-brick/post/*.sh \ - %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/add-brick/post -%{__install} -p -m 0744 extras/hook-scripts/add-brick/pre/*.sh \ - %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/add-brick/pre -%{__install} -p -m 0744 extras/hook-scripts/reset/post/*.sh \ - %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/reset/post - %if ( ! 0%{_for_fedora_koji_builds} ) find ./tests ./run-tests.sh -type f | cpio -pd %{buildroot}%{_prefix}/share/glusterfs %endif ## Install bash completion for cli -install -p -m 0744 -D extras/command-completion/gluster.bash \ +install -p -m 0755 -D extras/command-completion/gluster.bash \ %{buildroot}%{_sysconfdir}/bash_completion.d/gluster mv %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.* %{buildroot}%{_libexecdir}/glusterfs/ @@ -851,8 +825,7 @@ rm -rf %{buildroot} %endif %endif -%post api -/sbin/ldconfig +%post api -p /sbin/ldconfig %post fuse %if ( 0%{?rhel} == 5 ) @@ -867,8 +840,7 @@ if [ $1 -ge 1 ]; then fi %endif -%post libs -/sbin/ldconfig +%post libs -p /sbin/ldconfig %post server # Legacy server @@ -975,8 +947,7 @@ fi %endif %endif -%postun api -/sbin/ldconfig +%postun api -p /sbin/ldconfig %postun server %if (0%{?_with_firewalld:1}) @@ -986,8 +957,7 @@ if $(systemctl is-active firewalld 1>/dev/null 2>&1); then fi %endif -%postun libs -/sbin/ldconfig +%postun libs -p /sbin/ldconfig ##----------------------------------------------------------------------------- ## All %%files should be placed here and keep them sorted by groups @@ -1124,6 +1094,8 @@ fi %dir %{_libexecdir}/ganesha %attr(0755,-,-) %{_libexecdir}/ganesha/* %attr(0755,-,-) %{_prefix}/lib/ocf/resource.d/heartbeat/* +%{_sharedstatedir}/glusterd/hooks/1/start/post/S31ganesha-start.sh +%{_sharedstatedir}/glusterd/hooks/1/reset/post/S31ganesha-reset.sh %endif %if ( 0%{!?_without_georeplication:1} ) @@ -1198,16 +1170,14 @@ fi %if ( 0%{_for_fedora_koji_builds} ) %config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd %endif -%config %{_sharedstatedir}/glusterd/hooks/1/add-brick/post/disabled-quota-root-xattr-heal.sh -%config %{_sharedstatedir}/glusterd/hooks/1/add-brick/pre/S28Quota-enable-root-xattr-heal.sh -%config %{_sharedstatedir}/glusterd/hooks/1/set/post/S30samba-set.sh -%config %{_sharedstatedir}/glusterd/hooks/1/set/post/S32gluster_enable_shared_storage.sh -%config %{_sharedstatedir}/glusterd/hooks/1/start/post/S29CTDBsetup.sh -%config %{_sharedstatedir}/glusterd/hooks/1/start/post/S30samba-start.sh -%config %{_sharedstatedir}/glusterd/hooks/1/start/post/S31ganesha-start.sh -%config %{_sharedstatedir}/glusterd/hooks/1/stop/pre/S30samba-stop.sh -%config %{_sharedstatedir}/glusterd/hooks/1/stop/pre/S29CTDB-teardown.sh -%config %{_sharedstatedir}/glusterd/hooks/1/reset/post/S31ganesha-reset.sh +%{_sharedstatedir}/glusterd/hooks/1/add-brick/post/disabled-quota-root-xattr-heal.sh +%{_sharedstatedir}/glusterd/hooks/1/add-brick/pre/S28Quota-enable-root-xattr-heal.sh +%{_sharedstatedir}/glusterd/hooks/1/set/post/S30samba-set.sh +%{_sharedstatedir}/glusterd/hooks/1/set/post/S32gluster_enable_shared_storage.sh +%{_sharedstatedir}/glusterd/hooks/1/start/post/S29CTDBsetup.sh +%{_sharedstatedir}/glusterd/hooks/1/start/post/S30samba-start.sh +%{_sharedstatedir}/glusterd/hooks/1/stop/pre/S30samba-stop.sh +%{_sharedstatedir}/glusterd/hooks/1/stop/pre/S29CTDB-teardown.sh # init files %_init_glusterd %if ( 0%{_for_fedora_koji_builds} ) @@ -1252,30 +1222,32 @@ fi %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/post %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/pre +%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete +%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/post +%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/pre %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set/post %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/post %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre -%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete -%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/post %ghost %attr(0644,-,-) %config(noreplace) %{_sharedstatedir}/glusterd/glusterd.info %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options # This is really ugly, but I have no idea how to mark these directories in # any other way. They should belong to the glusterfs-server package, but # don't exist after installation. They are generated on the first start... -%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/post -%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/pre -%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick -%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick/post -%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick/pre -%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set/pre %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create/post %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create/pre %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/pre +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick/post +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick/pre +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/reset/pre +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set/pre +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/pre +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/post %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/glustershd %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/vols %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/peers @@ -1299,6 +1271,9 @@ fi %endif %changelog +* Mon Feb 8 2016 Kaleb S. KEITHLEY - 3.7.8-1 +- GlusterFS 3.7.8 GA + * Wed Feb 03 2016 Fedora Release Engineering - 3.7.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 2955c3a..09420aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fcde32df66a78249d389fc90e8bf2f68 glusterfs-3.7.7.tar.gz +c488a2f546f9c24ce873e3de6289e9aa glusterfs-3.7.8.tar.gz