Merge trunk revision 2374:

r2374 | fabbione | 2009-07-28 10:11:29 -0700 (Tue, 28 Jul 2009) | 2 lines

Fix spec file and update macro usage



git-svn-id: http://svn.fedorahosted.org/svn/corosync/branches/flatiron@2427 fd59a12c-fef9-0310-b244-a6a79926bd2f

corosync.spec.in

@@ -34,9 +34,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
@@ -83,9 +83,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
@@ -99,6 +99,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*