Merge remote-tracking branch 'origin/master' into el5

glusterfs.spec

@@ -50,7 +50,7 @@ Summary:          Cluster File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
 Version:          3.4.1
-Release:          1%{?prereltag:.%{prereltag}}%{?dist}
+Release:          2%{?prereltag:.%{prereltag}}%{?dist}
 Vendor:           Fedora Project
 %else
 Name:             @PACKAGE_NAME@
@@ -619,7 +619,7 @@ fi
 %endif
 # init files
 %_init_glusterd
-%if ( 0%{_for_fedora_koji_builds} && 0%{?_with_systemd:1} )
+%if ( 0%{_for_fedora_koji_builds} )
 %_init_glusterfsd
 %endif
 # binaries
@@ -765,6 +765,9 @@ fi
 
 
 %changelog
+* Tue Oct 1 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.1-2
+- resurrect /etc/init.d/glusterfsd, BUG 1014242
+
 * Fri Sep 27 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.1-1
 - GlusterFS 3.4.1 GA, glusterfs-3.4.1-1