[hekafs/f16] Requires glusterfs-3.2.5-1

[Kaleb S. KEITHLEY]

commit e68031821f4700b931c5cbf0d88a5a0681ff4c61
Author: Kaleb KEITHLEY <kkeithle at f16node1.kkeithle.usersys.redhat.com>
Date:   Thu Nov 17 14:48:37 2011 -0500

    Requires glusterfs-3.2.5-1

 hekafs.spec |   34 +++++++++++++++++-----------------
 sources     |    2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/hekafs.spec b/hekafs.spec
index 99b7af9..38cfe25 100644
--- a/hekafs.spec
+++ b/hekafs.spec
@@ -2,7 +2,7 @@
 Summary:          Heka File System
 Name:             hekafs
 Version:          0.7
-Release:          18%{?dist}
+Release:          19%{?dist}
 License:          GPLv3
 Group:            System Environment/Base
 Vendor:           Red Hat
@@ -10,13 +10,13 @@ URL:              http://cloudfs.org
 Source0:          http://cloudfs.org/dist/%{version}/%{name}-%{version}.tgz
 
 # Fedora way
-BuildRequires:    glusterfs-devel = 3.2.4
+BuildRequires:    glusterfs-devel = 3.2.5
 BuildRequires:    bison
 BuildRequires:    flex
 BuildRequires:    openssl-devel
 BuildRequires:    libtool
 
-Requires:         glusterfs = 3.2.4
+Requires:         glusterfs = 3.2.5
 Requires:         openssl
 Requires:         python
 %if 0%{?fedora} < 17
@@ -28,6 +28,8 @@ Requires(postun): /sbin/service
 %define _daemon_disable() /sbin/chkconfig --del %1 ;
 %define _daemon_restart() /sbin/service %1 condrestart &>/dev/null ;
 %define _daemon_stop()    /sbin/service %1 stop &>/dev/null ;
+%define _init_install() %{__install} -D -p -m 0755 %{1} %{buildroot}%{_sysconfdir}/init.d/%{2} ;
+%define _init_file      %{_sysconfdir}/init.d/hekafsd
 %else
 BuildRequires:    systemd-units
 Requires(post):   systemd-units
@@ -37,6 +39,8 @@ Requires(postun): systemd-units
 %define _daemon_disable() /bin/systemctl disable %1.service ;
 %define _daemon_restart() /bin/systemctl try-restart %1.service ;
 %define _daemon_stop()    /bin/systemctl stop %1.service ;
+%define _init_install() %{__install} -D -p -m 0644 %{1} %{buildroot}%{_unitdir}/%{2}.service ;
+%define _init_file      %{_unitdir}/hekafsd.service
 %endif
 Obsoletes:        cloudfs <= 0:0.7-6
 
@@ -76,11 +80,7 @@ with additional authentication/encryption/multi-tenancy features.
 %{__ln_s} %{python_sitelib}/hfs_stop_volume.py %{buildroot}%{_bindir}/hfs_stop_volume
 %{__ln_s} %{python_sitelib}/hfs_update_cert.py %{buildroot}%{_bindir}/hfs_update_cert
 %{__mkdir} %{buildroot}%{_sysconfdir}/
-%if 0%{?fedora} < 17
-%{__install} -D -p -m0755 hekafsd %{buildroot}%{_sysconfdir}/init.d/hekafsd
-%else
-%{__install} -D -p -m 0644 hekafsd.service %{buildroot}%{_unitdir}/hekafsd.service
-%endif
+%_init_install hekafsd hekafsd
 %{__mkdir} -p %{buildroot}%{_var}/log/hekafs
 %{__mkdir} -p %{buildroot}%{_var}/lib/hekafs
 %{__mkdir} -p %{buildroot}/run/hekafs
@@ -109,17 +109,13 @@ find %{buildroot}%{_libdir}/glusterfs -name '*.la' -delete
 %files
 %doc COPYING
 %docdir %{_mandir}/man8/
-%{_libdir}/glusterfs/3.2.4/xlator/encryption/*.so*
-%{_libdir}/glusterfs/3.2.4/xlator/features/*.so*
-%{_libdir}/glusterfs/3.2.4/xlator/protocol/*.so*
-%{_libdir}/glusterfs/3.2.4/rpc-transport/*.so*
+%{_libdir}/glusterfs/3.2.5/xlator/encryption/*.so*
+%{_libdir}/glusterfs/3.2.5/xlator/features/*.so*
+%{_libdir}/glusterfs/3.2.5/xlator/protocol/*.so*
+%{_libdir}/glusterfs/3.2.5/rpc-transport/*.so*
 %{python_sitelib}/*
 %{_bindir}/*
-%if 0%{?fedora} < 17
-%{_sysconfdir}/init.d/hekafsd
-%else
-%{_unitdir}/hekafsd.service
-%endif
+%_init_file
 %{_var}/log/hekafs/
 %{_var}/lib/hekafs/
 /run/hekafs/
@@ -135,6 +131,10 @@ if [ $1 = 0 ]; then
 fi
 
 %changelog
+* Thu Nov 17 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 0.7-19
+- revised spec for init.d to systemd, minimize fedora < 17
+- update to glusterfs 3.2.5
+
 * Mon Nov 14 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 0.7-18
 - BZ 752807, Do not return -1 from STACK_WIND targets in uidmap xlator
 - License GPLv3
diff --git a/sources b/sources
index 843b064..9d9ab14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a50664b9bb2f833404e8698ba6f83c6  hekafs-0.7.tgz
+27b8cfc558a8d4424d1a7518875e6f72  hekafs-0.7.tgz