diff --git a/glusterfs.spec b/glusterfs.spec index d7e7256..8cedab9 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -138,10 +138,6 @@ ## All %%global definitions should be placed here and keep them sorted ## -%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 @@ -175,7 +171,6 @@ %global _rundir %{_localstatedir}/run %endif -%if ( 0%{?_with_systemd:1} ) %global service_start() /bin/systemctl --quiet start %1.service || : \ %{nil} %global service_stop() /bin/systemctl --quiet stop %1.service || :\ @@ -188,24 +183,6 @@ %global glusterta_svcfile %{_unitdir}/gluster-ta-volume.service %global glustereventsd_svcfile %{_unitdir}/glustereventsd.service %global glusterfssharedstorage_svcfile %{_unitdir}/glusterfssharedstorage.service -%else -%global systemd_post() /sbin/chkconfig --add %1 >/dev/null 2>&1 || : \ -%{nil} -%global systemd_preun() /sbin/chkconfig --del %1 >/dev/null 2>&1 || : \ -%{nil} -%global systemd_postun_with_restart() /sbin/service %1 condrestart >/dev/null 2>&1 || : \ -%{nil} -%global service_start() /sbin/service %1 start >/dev/null 2>&1 || : \ -%{nil} -%global service_stop() /sbin/service %1 stop >/dev/null 2>&1 || : \ -%{nil} -%global service_install() install -D -p -m 0755 %{_sourcedir}/%1.init %{buildroot}%2 \ -%{nil} -# can't seem to make a generic macro that works -%global glusterd_svcfile %{_sysconfdir}/init.d/glusterd -%global glusterfsd_svcfile %{_sysconfdir}/init.d/glusterfsd -%global glustereventsd_svcfile %{_sysconfdir}/init.d/glustereventsd -%endif %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -232,7 +209,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 6.0 +Version: 6.1 Release: %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ @@ -252,14 +229,10 @@ Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz %endif Requires(pre): shadow-utils -%if ( 0%{?_with_systemd:1} ) BuildRequires: systemd -%endif Requires: %{name}-libs = %{version}-%{release} -%if ( 0%{?_with_systemd:1} ) %{?systemd_requires} -%endif Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig %if 0%{?_with_asan:1} && !( 0%{?rhel} && 0%{?rhel} < 7 ) @@ -443,9 +416,7 @@ Requires: python%{_pythonver}-requests %if ( 0%{?rhel} && 0%{?rhel} < 7 ) Requires: python-argparse %endif -%if ( 0%{?_with_systemd:1} ) %{?systemd_requires} -%endif %description events GlusterFS is a distributed file-system capable of scaling to several @@ -658,14 +629,7 @@ Requires: %{name}-client-xlators = %{version}-%{release} # lvm2 for snapshot, and nfs-utils and rpcbind/portmap for gnfs server Requires: psmisc Requires: lvm2 -%if ( 0%{?_with_systemd:1} ) %{?systemd_requires} -%else -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/service -Requires(preun): /sbin/chkconfig -Requires(postun): /sbin/service -%endif Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig %if (0%{?_with_firewalld:1}) @@ -1192,9 +1156,7 @@ exit 0 %{_datadir}/glusterfs/scripts/setup-thin-arbiter.sh %config %{_sysconfdir}/glusterfs/thin-arbiter.vol -%if ( 0%{?_with_systemd:1} ) %{_unitdir}/gluster-ta-volume.service -%endif %if ( 0%{!?_without_georeplication:1} ) @@ -1297,9 +1259,7 @@ exit 0 %if ( 0%{_for_fedora_koji_builds} ) %glusterfsd_svcfile %endif -%if ( 0%{?_with_systemd:1} ) %glusterfssharedstorage_svcfile -%endif # binaries %{_sbindir}/glusterd @@ -1410,11 +1370,9 @@ exit 0 %dir %{_datadir}/glusterfs %dir %{_datadir}/glusterfs/scripts %{_datadir}/glusterfs/scripts/stop-all-gluster-processes.sh -%if ( 0%{?_with_systemd:1} ) %{_libexecdir}/glusterfs/mount-shared-storage.sh %{_datadir}/glusterfs/scripts/control-cpu-load.sh %{_datadir}/glusterfs/scripts/control-mem.sh -%endif # Incrementalapi %dir %{_libexecdir}/glusterfs @@ -1442,14 +1400,13 @@ exit 0 %{_sbindir}/glustereventsd %{_sbindir}/gluster-eventsapi %{_datadir}/glusterfs/scripts/eventsdash.py* -%if ( 0%{?_with_systemd:1} ) %{_unitdir}/glustereventsd.service -%else -%{_sysconfdir}/init.d/glustereventsd -%endif %endif %changelog +* Wed Apr 17 2019 Kaleb S. KEITHLEY - 6.1-1 +- 6.1 GA + * Wed Mar 20 2019 Kaleb S. KEITHLEY - 6.0-1 - 6.0 GA diff --git a/sources b/sources index dcf42ed..c9b192d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-6.0.tar.gz) = fc4f4ee75b3936469b7c4be146545eb88d2cf3583d5f101bcacb2805c842aa95f69d1c023dee4dac32ebe01cdc9ede4814f9364482e8815e451e43660e6c74b9 +SHA512 (glusterfs-6.1.tar.gz) = 53f4195ecb565a8dcc0d66e74d07dd7334e3c8b1cc1671517612be32a00e9e9bbfb5e983955c4f116b25f7df990bcd1c05bbd3d0b740e9f8c76a16b9b16bec00