rpms/corosync/F-11 corosync.spec, 1.24, 1.25 sources, 1.5, 1.6 fix-pkgconfig.diff, 1.1, NONE

[Fabio M. Di Nitto]

Author: fabbione

Update of /cvs/pkgs/rpms/corosync/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15387

Modified Files:
	corosync.spec sources 
Removed Files:
	fix-pkgconfig.diff 
Log Message:
New upstream release to fix several major bugs



Index: corosync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-11/corosync.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- corosync.spec	30 Mar 2009 07:00:39 -0000	1.24
+++ corosync.spec	28 Jul 2009 12:30:54 -0000	1.25
@@ -1,14 +1,13 @@
-## define alphatag svn1797
+# define alphatag svn1211
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 0.95
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Version: 1.0.0
+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: fix-pkgconfig.diff
 
 # Runtime bits
 Requires: corosynclib = %{version}-%{release}
@@ -17,32 +16,28 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Conflicts: openais <= 0.89, openais-devel <= 0.89
 
-# Setup/build bits
-%define ais_user_uid 39
-
 %define buildtrunk 0
+%{?alphatag: %define buildtrunk 1}
 %{?_with_buildtrunk: %define buildtrunk 1}
 
 %if %{buildtrunk}
 BuildRequires: autoconf automake
 %endif
+BuildRequires: nss-devel
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %prep
 %setup -q -n corosync-%{version}
-%patch0 -p1
 
 %if %{buildtrunk}
-if [ ! -f configure ]; then
-	./autogen.sh
-fi
+./autogen.sh
 %endif
 
-%{_configure} 	CFLAGS="$(echo '%{optflags}')" \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
+%{_configure}	CFLAGS="$(echo '%{optflags}')" \
+		--prefix=%{_prefix} \
+		--sysconfdir=%{_sysconfdir} \
+		--localstatedir=%{_localstatedir} \
 		--libdir=%{_libdir}
 
 %build
@@ -68,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 || :
 
@@ -94,7 +84,9 @@ fi
 %{_sbindir}/corosync-cfgtool
 %{_sbindir}/corosync-fplay
 %{_sbindir}/corosync-pload
-%config(noreplace) /etc/corosync.conf
+%dir %{_sysconfdir}/corosync
+%dir %{_sysconfdir}/corosync/uidgid.d
+%config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example
 %{_initddir}/corosync
 %dir %{_libexecdir}/lcrso
 %{_libexecdir}/lcrso/coroparse.lcrso
@@ -108,7 +100,7 @@ fi
 %{_libexecdir}/lcrso/quorum_testquorum.lcrso
 %{_libexecdir}/lcrso/vsf_quorum.lcrso
 %{_libexecdir}/lcrso/vsf_ykd.lcrso
-%{_libexecdir}/lcrso/quorum.lcrso
+%dir %{_localstatedir}/lib/corosync
 %{_mandir}/man8/corosync_overview.8*
 %{_mandir}/man8/corosync-objctl.8*
 %{_mandir}/man5/corosync.conf.5*
@@ -157,6 +149,9 @@ The Corosync Cluster Engine APIs.
 %doc LICENSE README.devmap
 %dir %{_includedir}/corosync/
 %{_includedir}/corosync/cs_config.h
+%{_includedir}/corosync/corodefs.h
+%{_includedir}/corosync/coroipc_types.h
+%{_includedir}/corosync/coroipcs.h
 %{_includedir}/corosync/coroipcc.h
 %{_includedir}/corosync/cfg.h
 %{_includedir}/corosync/confdb.h
@@ -164,7 +159,6 @@ The Corosync Cluster Engine APIs.
 %{_includedir}/corosync/cpg.h
 %{_includedir}/corosync/evs.h
 %{_includedir}/corosync/hdb.h
-%{_includedir}/corosync/ipc_gen.h
 %{_includedir}/corosync/list.h
 %{_includedir}/corosync/mar_gen.h
 %{_includedir}/corosync/swab.h
@@ -209,6 +203,39 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man8/coroipc_overview.8*
 
 %changelog
+* Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.0.0-1
+- New upstream release
+- spec file updates:
+  * more consistent use of macros across the board
+  * fix directory ownership
+
+* Thu Jul  2 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.100-1
+- New upstream release
+
+* Sat Jun 20 2009 Fabio M. Di Nitto <fdinitto at 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 at redhat.com> - 0.97-1.svn2233
+- spec file updates:
+  * Update to svn version 2233 to include library linking fixes
+
+* Wed Jun 10 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.97-1.svn2232
+- New upstream release
+- spec file updates:
+  * Drop pkgconfig fix that's now upstream
+  * Update to svn version 2232
+  * Define buildtrunk if we are using svn snapshots
+  * BuildRequires: nss-devel to enable nss crypto for network communication
+  * Force autogen invokation if buildtrunk is defined
+  * Whitespace cleanup
+  * Stop shipping corosync.conf in favour of a generic example
+  * Update file list
+
 * Mon Mar 30 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.95-2
 - Backport svn commit 1913 to fix pkgconfig files generation
   and unbreak lvm2 build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	24 Mar 2009 07:33:41 -0000	1.5
+++ sources	28 Jul 2009 12:30:54 -0000	1.6
@@ -1 +1 @@
-24b268b66d95b09f7177c73bb226de74  corosync-0.95.tar.gz
+257f5509f3da951ba84b596fedf42185  corosync-1.0.0.tar.gz


--- fix-pkgconfig.diff DELETED ---