New upstream release

.cvsignore

@@ -1,2 +1 @@
-corosync-0.97.tar.gz
+corosync-0.98.tar.gz
-corosync-trunk.diff

corosync.spec

@@ -1,14 +1,13 @@
-%define alphatag svn2233
+# define alphatag svn1211
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 0.97
+Version: 0.98
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.openais.org
 Source0: http://developer.osdl.org/dev/openais/downloads/corosync-%{version}/corosync-%{version}.tar.gz
-Patch0: corosync-trunk.diff
 
 # Runtime bits
 Requires: corosynclib = %{version}-%{release}
@@ -17,14 +16,8 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Conflicts: openais <= 0.89, openais-devel <= 0.89
 
-# Setup/build bits
-%define ais_user_uid 39
-
-%if %{alphatag}
-%define buildtrunk 1
-%else
 %define buildtrunk 0
-%endif
+%{?alphatag: %define buildtrunk 1}
 %{?_with_buildtrunk: %define buildtrunk 1}
 
 %if %{buildtrunk}
@@ -36,7 +29,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %prep
 %setup -q -n corosync-%{version}
-%patch0 -p0
 
 %if %{buildtrunk}
 ./autogen.sh
@@ -71,11 +63,6 @@ rm -rf %{buildroot}
 This package contains the Corosync Cluster Engine Executive, several default
 APIs and libraries, default configuration files, and an init script.
 
-%pre
-# Add the "ais" user
-/usr/sbin/useradd -c 'The Corosync Cluster Engine' \
- -u %{ais_user_uid} -s /sbin/nologin -r -d '/' ais 2> /dev/null || :
-
 %post
 /sbin/chkconfig --add corosync || :
 
@@ -97,7 +84,9 @@ fi
 %{_sbindir}/corosync-cfgtool
 %{_sbindir}/corosync-fplay
 %{_sbindir}/corosync-pload
-%config(noreplace) /etc/corosync.conf.example
+%dir /etc/corosync
+%dir /etc/corosync/uidgid.d
+%config(noreplace) /etc/corosync/corosync.conf.example
 %{_initddir}/corosync
 %dir %{_libexecdir}/lcrso
 %{_libexecdir}/lcrso/coroparse.lcrso
@@ -213,6 +202,14 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man8/coroipc_overview.8*
 
 %changelog
+* Sat Jun 20 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 0.98-1
+- New upstream release
+- spec file updates:
+  * Drop corosync-trunk patch and alpha tag.
+  * Fix alphatag vs buildtrunk handling.
+  * Drop requirement on ais user/group and stop creating them.
+  * New config file locations from upstream: /etc/corosync/corosync.conf.
+
 * Wed Jun 10 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 0.97-1.svn2233
 - spec file updates:
   * Update to svn version 2233 to include library linking fixes

sources

@@ -1,2 +1 @@
-1bab8a601e9c546c8307ca673427afbd  corosync-0.97.tar.gz
+49a058b7384003132cd82c4676faa75f  corosync-0.98.tar.gz
-4265b7e1fe87a3bb471c5c637d94e905  corosync-trunk.diff