From bdcd95c18e714b635015bf704586de1ed169cec1 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 1 Oct 2013 11:53:09 -0400 Subject: [PATCH 1/2] glusterfs-3.4.1-2, BUG 1014242 --- glusterfs.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/glusterfs.spec b/glusterfs.spec index 757dd90..e7717af 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -411,8 +411,10 @@ This package provides the api include files. %{__install} -D -p -m 0644 extras/glusterd-sysconfig \ %{buildroot}%{_sysconfdir}/sysconfig/glusterd %endif +%if ( 0%{?rhel} && 0%{?rhel} > 5 ) %{__mkdir_p} %{buildroot}%{python_sitelib}/gluster touch %{buildroot}%{python_sitelib}/gluster/__init__.py +%endif %if ( 0%{_for_fedora_koji_builds} ) %if ( 0%{?rhel} && 0%{?rhel} <= 5 ) @@ -617,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 @@ -674,7 +676,9 @@ fi %exclude %{_libdir}/*.so %{_libdir}/libgfapi.* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/api* +%if ( 0%{?rhel} && 0%{?rhel} > 5 ) %{python_sitelib}/gluster/__init__.p* +%endif %if ( 0%{!?_without_ocf:1} ) %files resource-agents @@ -761,6 +765,9 @@ fi %changelog +* Tue Oct 1 2013 Kaleb S. KEITHLEY - 3.4.1-2 +- resurrect /etc/init.d/glusterfsd, BUG 1014242 + * Fri Sep 27 2013 Kaleb S. KEITHLEY - 3.4.1-1 - GlusterFS 3.4.1 GA, glusterfs-3.4.1-1 From 06b0ae2b84d1d918bf13951eacb4907fb99319b1 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 1 Oct 2013 11:58:08 -0400 Subject: [PATCH 2/2] 3.4.1-2, again --- glusterfs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glusterfs.spec b/glusterfs.spec index e7717af..c1fff57 100644 --- a/glusterfs.spec +++ b/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@