From 2a9820c76ff5e54160a38e066fdf5cbcc9ffb053 Mon Sep 17 00:00:00 2001
From: Jonathan Steffan <jsteffan@fedoraproject.org>
Date: Sun, 6 Feb 2011 16:14:25 -0700
Subject: [PATCH] Update spec to support building on old branches.

---
 glusterfs.spec | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/glusterfs.spec b/glusterfs.spec
index 14889e9..53ab339 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -8,7 +8,7 @@
 
 Name:             glusterfs
 Version:          %{major_minor}.2
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Clustered file-system
 
 Group:            System Environment/Base
@@ -24,6 +24,7 @@ Source5:          glusterd.logrotate
 Source11:         glusterfsd.init
 Source12:         glusterfsd.sysconfig
 Source15:         glusterfsd.logrotate
+BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # bugs.gluster.com #2309 (pending)
 Patch1:         wb-quota.patch
@@ -169,6 +170,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %{__make}
 
 %install
+rm -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
 # We'll use our init.d
@@ -219,12 +221,12 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha
 
 # Install init script and sysconfig file
 %{__install} -D -p -m 0755 %{SOURCE1} \
-    %{buildroot}%{_initddir}/glusterd
+    %{buildroot}%{_sysconfdir}/init.d/glusterd
 %{__install} -D -p -m 0644 %{SOURCE2} \
     %{buildroot}%{_sysconfdir}/sysconfig/glusterd
 # Legacy init script and sysconfig file
 %{__install} -D -p -m 0755 %{SOURCE11} \
-    %{buildroot}%{_initddir}/glusterfsd
+    %{buildroot}%{_sysconfdir}/init.d/glusterfsd
 %{__install} -D -p -m 0644 %{SOURCE12} \
     %{buildroot}%{_sysconfdir}/sysconfig/glusterfsd
 
@@ -246,6 +248,9 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha
 %{__install} -D -p -m 644 extras/glusterfs.vim \
     %{buildroot}%{_datadir}/vim/vimfiles/syntax/glusterfs.vim
 
+%clean
+rm -rf %{buildroot}
+
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING INSTALL README THANKS
@@ -292,9 +297,9 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha
 %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfsd
 %config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd
 %{_sharedstatedir}/glusterd
-%{_initddir}/glusterd
+%{_sysconfdir}/init.d/glusterd
 # Legacy init
-%{_initddir}/glusterfsd
+%{_sysconfdir}/init.d/glusterfsd
 
 %files vim
 %defattr(-,root,root,-)
@@ -335,6 +340,9 @@ if [ $1 -ge 1 ]; then
 fi
 
 %changelog
+* Sun Feb 06 2011 Jonathan Steffan <jsteffan@fedoraproject.org> - 3.1.2-3
+- Add back in legacy SPEC elements to support older branches
+
 * Tue Feb 03 2011 Jonathan Steffan <jsteffan@fedoraproject.org> - 3.1.2-2
 - Add patches from CloudFS project