From e106048a7a7d24e02432410952292b8e0884e822 Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Date: Tue, 28 Jul 2009 07:22:41 +0000
Subject: [PATCH] Fix directory ownership and consistent use of macros

---
 corosync.spec | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/corosync.spec b/corosync.spec
index 29c9b84..0326cf5 100644
--- a/corosync.spec
+++ b/corosync.spec
@@ -3,7 +3,7 @@
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
 Version: 1.0.0
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Release: 3%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.openais.org
@@ -35,9 +35,9 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 %endif
 
 %{_configure}	CFLAGS="$(echo '%{optflags}')" \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
+		--prefix=%{_prefix} \
+		--sysconfdir=%{_sysconfdir} \
+		--localstatedir=%{_localstatedir} \
 		--libdir=%{_libdir}
 
 %build
@@ -84,9 +84,9 @@ fi
 %{_sbindir}/corosync-cfgtool
 %{_sbindir}/corosync-fplay
 %{_sbindir}/corosync-pload
-%dir /etc/corosync
-%dir /etc/corosync/uidgid.d
-%config(noreplace) /etc/corosync/corosync.conf.example
+%dir %{_sysconfdir}/corosync
+%dir %{_sysconfdir}/corosync/uidgid.d
+%config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example
 %{_initddir}/corosync
 %dir %{_libexecdir}/lcrso
 %{_libexecdir}/lcrso/coroparse.lcrso
@@ -100,6 +100,7 @@ fi
 %{_libexecdir}/lcrso/quorum_testquorum.lcrso
 %{_libexecdir}/lcrso/vsf_quorum.lcrso
 %{_libexecdir}/lcrso/vsf_ykd.lcrso
+%dir %{_localstatedir}/lib/corosync
 %{_mandir}/man8/corosync_overview.8*
 %{_mandir}/man8/corosync-objctl.8*
 %{_mandir}/man5/corosync.conf.5*
@@ -202,6 +203,11 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man8/coroipc_overview.8*
 
 %changelog
+* Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.0.0-3
+- spec file updates:
+  * more consistent use of macros across the board
+  * fix directory ownership
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild