diff --git a/glusterfs.spec b/glusterfs.spec index 90cbdba..6f63365 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -78,13 +78,17 @@ %endif ##----------------------------------------------------------------------------- -## All %global definitions should be placed here and keep them sorted +## All %%global definitions should be placed here and keep them sorted ## -%if ( 0%{?fedora} && 0%{?fedora} > 16 ) || ( 0%{?rhel} && 0%{?rhel} > 6 ) +%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 ) %global _with_systemd true %endif +%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 ) +%global _with_firewalld --enable-firewalld +%endif + %if 0%{?_tmpfilesdir:1} %define _with_tmpfilesdir --with-tmpfilesdir=%{_tmpfilesdir} %else @@ -164,7 +168,7 @@ Summary: Cluster File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 3.7.5 +Version: 3.7.6 Release: 1%{?prereltag:.%{prereltag}}%{?dist} Vendor: Fedora Project %else @@ -233,6 +237,10 @@ BuildRequires: glib2-devel BuildRequires: libattr-devel %endif +%if (0%{?_with_firewalld:1}) +BuildRequires: firewalld +%endif + Obsoletes: hekafs Obsoletes: %{name}-common < %{version}-%{release} Obsoletes: %{name}-core < %{version}-%{release} @@ -343,7 +351,7 @@ This package provides the development libraries and include files. %package extra-xlators Summary: Extra Gluster filesystem Translators Group: Applications/File -# We need -api rpm for its __init__.py in Python +# We need python-gluster rpm for gluster module's __init__.py in Python # site-packages area Requires: python-gluster = %{version}-%{release} Requires: python python-ctypes @@ -360,7 +368,6 @@ is in user space and easily manageable. This package provides extra filesystem Translators, such as Glupy, for GlusterFS. - %package fuse Summary: Fuse client Group: Applications/File @@ -608,6 +615,7 @@ This package provides the glusterfs server daemon. %{?_without_epoll} \ %{?_without_fusermount} \ %{?_without_georeplication} \ + %{?_with_firewalld} \ %{?_without_ocf} \ %{?_without_qemu_block} \ %{?_without_rdma} \ @@ -616,7 +624,7 @@ This package provides the glusterfs server daemon. %{?_without_tiering} # fix hardening and remove rpath in shlibs -%if ( 0%{?fedora} && 0%{?fedora} > 17 ) || ( 0%{?rhel} && 0%{?rhel} > 6 ) +%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 ) sed -i 's| \\\$compiler_flags |&\\\$LDFLAGS |' libtool %endif sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|' libtool @@ -685,7 +693,7 @@ find %{buildroot}%{_libdir} -name '*.la' -delete # Remove installed docs, the ones we want are included by %%doc, in # /usr/share/doc/glusterfs or /usr/share/doc/glusterfs-x.y.z depending # on the distribution -%if ( 0%{?fedora} && 0%{?fedora} > 19 ) || ( 0%{?rhel} && 0%{?rhel} > 6 ) +%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 ) rm -rf %{buildroot}%{_pkgdocdir}/* %else rm -rf %{buildroot}%{_defaultdocdir}/%{name} @@ -822,7 +830,7 @@ ln -s %{_libexecdir}/glusterfs/S57glusterfind-delete-post.py %{buildroot}%{_shar rm -rf %{buildroot} ##----------------------------------------------------------------------------- -## All %post should be placed here and keep them sorted +## All %%post should be placed here and keep them sorted ## %post %if ( 0%{!?_without_syslog:1} ) @@ -892,6 +900,15 @@ if [ -e /etc/ld.so.conf.d/glusterfs.conf ]; then rm -f /etc/ld.so.conf.d/glusterfs.conf /sbin/ldconfig fi + +%if (0%{?_with_firewalld:1}) +#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 +fi +%endif + pidof -c -o %PPID -x glusterd &> /dev/null if [ $? -eq 0 ]; then kill -9 `pgrep -f gsyncd.py` &> /dev/null @@ -915,7 +932,7 @@ else fi ##----------------------------------------------------------------------------- -## All %preun should be placed here and keep them sorted +## All %%preun should be placed here and keep them sorted ## %preun server if [ $1 -eq 0 ]; then @@ -936,7 +953,7 @@ if [ $1 -ge 1 ]; then fi ##----------------------------------------------------------------------------- -## All %postun should be placed here and keep them sorted +## All %%postun should be placed here and keep them sorted ## %postun /sbin/ldconfig @@ -949,6 +966,14 @@ fi %postun api /sbin/ldconfig +%postun server +%if (0%{?_with_firewalld:1}) +#reload service files if firewalld running +if $(systemctl is-active firewalld 1>/dev/null 2>&1); then + firewall-cmd --reload +fi +%endif + %postun libs /sbin/ldconfig @@ -1158,8 +1183,8 @@ fi %if ( 0%{_for_fedora_koji_builds} ) %config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd %endif -%config %{_sharedstatedir}/glusterd/hooks/1/add-brick/pre/S28Quota-enable-root-xattr-heal.sh %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 @@ -1232,7 +1257,6 @@ fi %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/reset/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 @@ -1255,8 +1279,14 @@ fi %{_sharedstatedir}/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.py %{_libexecdir}/glusterfs/S57glusterfind-delete-post.* +%if ( 0%{?_with_firewalld:1} ) +%{_prefix}/lib/firewalld/services/glusterfs.xml +%endif %changelog +* Mon Nov 9 2015 Kaleb S. KEITHLEY - 3.7.6-1 +- GlusterFS 3.7.6 GA + * Wed Oct 7 2015 Kaleb S. KEITHLEY - 3.7.5-1 - GlusterFS 3.7.5 GA diff --git a/sources b/sources index fb058a4..1031a69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7c74cfcc5f3712de7ee2972819aaefd3 glusterfs-3.7.5.tar.gz +af8df703e4e6b44f8baa1fe6a9d81f5c glusterfs-3.7.6.tar.gz