Merge trunk revision 2943:

r2943 | sdake | 2010-06-09 18:18:27 -0700 (Wed, 09 Jun 2010) | 8 lines

changes to corosync.spec.in template:

Move configure to %build section
don't set corosync's init levels during an upgrade of the corosync package

Patch from Vadym Chepkov


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

corosync.spec.in

@@ -32,6 +32,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 %prep
 %setup -q -n %{name}-%{version}
 
+%build
 %if %{buildtrunk}
 ./autogen.sh
 %endif
@@ -45,7 +46,6 @@ export rdmacm_LIBS=-lrdmacm \
 	--enable-rdma \
 	--with-initddir=%{_initddir}
 
-%build
 make %{_smp_mflags}
 
 %install
@@ -67,7 +67,9 @@ This package contains the Corosync Cluster Engine Executive, several default
 APIs and libraries, default configuration files, and an init script.
 
 %post
-/sbin/chkconfig --add corosync || :
+if [ $1 -eq 1 ]; then
+	/sbin/chkconfig --add corosync || :
+fi
 
 %preun
 if [ $1 -eq 0 ]; then