rpms/corosync/devel .cvsignore, 1.4, 1.5 corosync.spec, 1.22, 1.23 sources, 1.4, 1.5 corosync-1807.diff, 1.1, NONE corosync-bump-soname.diff, 1.1, NONE corosync-trunk.diff, 1.5, NONE

Tue Mar 24 07:34:12 UTC 2009

Author: fabbione

Update of /cvs/pkgs/rpms/corosync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6867

Modified Files:
	.cvsignore corosync.spec sources 
Removed Files:
	corosync-1807.diff corosync-bump-soname.diff 
	corosync-trunk.diff 
Log Message:
New upstream release.

Serious spec file cleanup.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5

--- .cvsignore	3 Mar 2009 05:48:35 -0000	1.4
+++ .cvsignore	24 Mar 2009 07:33:41 -0000	1.5
@@ -1 +1 @@
-corosync-0.94.tar.gz
+corosync-0.95.tar.gz


Index: corosync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/corosync.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- corosync.spec	10 Mar 2009 11:42:15 -0000	1.22
+++ corosync.spec	24 Mar 2009 07:33:41 -0000	1.23
@@ -1,16 +1,13 @@
-%define alphatag svn1797
+## define alphatag svn1797
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 0.94
-Release: 5%{?alphatag:.%{alphatag}}%{?dist}
+Version: 0.95
+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-bump-soname.diff
-Patch1: corosync-trunk.diff
-Patch2: corosync-1807.diff
 
 # Runtime bits
 Requires: corosynclib = %{version}-%{release}
@@ -22,33 +19,48 @@
 # Setup/build bits
 %define ais_user_uid 39
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%define buildtrunk 0
+%{?_with_buildtrunk: %define buildtrunk 1}
+
+%if %{buildtrunk}
+BuildRequires: autoconf automake
+%endif
+
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %prep
 %setup -q -n corosync-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
-%build
+%if %{buildtrunk}
+if [ ! -f configure ]; then
+	./autogen.sh
+fi
+%endif
 
-# -O3 required for performance reasons
-# So we get proper debug output, for now we don't compile with O3
-#CFLAGS="$(echo '%{optflags}' | sed -e 's/-O[0-9]*//') -O3"
-CFLAGS="$(echo '%{optflags}')"
-make CFLAGS="$CFLAGS"
+%{_configure} 	CFLAGS="$(echo '%{optflags}')" \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--libdir=%{_libdir}
+
+%build
+make %{_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT STATICLIBS=NO
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-mkdir -p $RPM_BUILD_ROOT%{_initddir}
-install -m 644 LICENSE SECURITY README.devmap \
- $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
-install -m 755 init/redhat $RPM_BUILD_ROOT%{_initddir}/corosync
+rm -rf %{buildroot}
+
+make install DESTDIR=%{buildroot}
+install -d %{buildroot}%{_initddir}
+install -m 755 init/redhat %{buildroot}%{_initddir}/corosync
+
+## tree fixup
+# drop static libs
+rm -f %{buildroot}%{_libdir}/*.a
+# drop docs and html docs for now
+rm -rf %{buildroot}%{_docdir}/*
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %description 
 This package contains the Corosync Cluster Engine Executive, several default
@@ -73,9 +85,7 @@
 
 %files 
 %defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/LICENSE
-%doc %{_docdir}/%{name}-%{version}/SECURITY
+%doc LICENSE SECURITY
 %{_sbindir}/corosync
 %{_sbindir}/corosync-keygen
 %{_sbindir}/corosync-objctl
@@ -92,10 +102,11 @@
 %{_libexecdir}/lcrso/service_evs.lcrso
 %{_libexecdir}/lcrso/service_confdb.lcrso
 %{_libexecdir}/lcrso/service_pload.lcrso
-%{_libexecdir}/lcrso/service_votequorum.lcrso
-%{_libexecdir}/lcrso/testquorum.lcrso
+%{_libexecdir}/lcrso/quorum_votequorum.lcrso
+%{_libexecdir}/lcrso/quorum_testquorum.lcrso
 %{_libexecdir}/lcrso/vsf_quorum.lcrso
 %{_libexecdir}/lcrso/vsf_ykd.lcrso
+%{_libexecdir}/lcrso/quorum.lcrso
 %{_mandir}/man8/corosync_overview.8*
 %{_mandir}/man8/corosync-objctl.8*
 %{_mandir}/man5/corosync.conf.5*
@@ -110,17 +121,18 @@
 
 %files -n corosynclib
 %defattr(-,root,root,-)
-%dir %{_libdir}/corosync
-%config(noreplace) /etc/ld.so.conf.d/corosync-*.conf
-%{_libdir}/corosync/libcfg.so.*
-%{_libdir}/corosync/libcpg.so.*
-%{_libdir}/corosync/libconfdb.so.*
-%{_libdir}/corosync/libevs.so.*
-%{_libdir}/corosync/libtotem_pg.so.*
-%{_libdir}/corosync/liblogsys.so.*
-%{_libdir}/corosync/libcoroipc.so.*
-%{_libdir}/corosync/libquorum.so.*
-%{_libdir}/corosync/libvotequorum.so.*
+%doc LICENSE
+%{_libdir}/libcfg.so.*
+%{_libdir}/libcpg.so.*
+%{_libdir}/libconfdb.so.*
+%{_libdir}/libevs.so.*
+%{_libdir}/libtotem_pg.so.*
+%{_libdir}/liblogsys.so.*
+%{_libdir}/libcoroipcc.so.*
+%{_libdir}/libcoroipcs.so.*
+%{_libdir}/libquorum.so.*
+%{_libdir}/libvotequorum.so.*
+%{_libdir}/libpload.so.*
 
 %post -n corosynclib -p /sbin/ldconfig
 
@@ -140,10 +152,10 @@
 
 %files -n corosynclib-devel
 %defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/README.devmap
+%doc LICENSE README.devmap
 %dir %{_includedir}/corosync/
-%{_includedir}/corosync/coroipc.h
+%{_includedir}/corosync/cs_config.h
+%{_includedir}/corosync/coroipcc.h
 %{_includedir}/corosync/cfg.h
 %{_includedir}/corosync/confdb.h
 %{_includedir}/corosync/corotypes.h
@@ -171,15 +183,17 @@
 %{_includedir}/corosync/engine/logsys.h
 %{_includedir}/corosync/engine/objdb.h
 %{_includedir}/corosync/engine/quorum.h
-%{_libdir}/corosync/libcfg.so
-%{_libdir}/corosync/libcpg.so
-%{_libdir}/corosync/libconfdb.so
-%{_libdir}/corosync/libevs.so
-%{_libdir}/corosync/libtotem_pg.so
-%{_libdir}/corosync/liblogsys.so
-%{_libdir}/corosync/libcoroipc.so
-%{_libdir}/corosync/libquorum.so
-%{_libdir}/corosync/libvotequorum.so
+%{_libdir}/libcfg.so
+%{_libdir}/libcpg.so
+%{_libdir}/libconfdb.so
+%{_libdir}/libevs.so
+%{_libdir}/libtotem_pg.so
+%{_libdir}/liblogsys.so
+%{_libdir}/libcoroipcc.so
+%{_libdir}/libcoroipcs.so
+%{_libdir}/libquorum.so
+%{_libdir}/libvotequorum.so
+%{_libdir}/libpload.so
 %{_libdir}/pkgconfig/*.pc
 %{_mandir}/man3/cpg_*3*
 %{_mandir}/man3/evs_*3*
@@ -190,8 +204,25 @@
 %{_mandir}/man8/confdb_overview.8*
 %{_mandir}/man8/logsys_overview.8*
 %{_mandir}/man8/votequorum_overview.8*
+%{_mandir}/man8/coroipc_overview.8*
 
 %changelog
+* Tue Mar 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.95-1
+- New upstream release
+- spec file updates:
+  * Drop alpha tag
+  * Drop local patches (no longer required)
+  * Allow to build from svn trunk by supporting rpmbuild --with buildtrunk 
+  * BuildRequires autoconf automake if building from trunk
+  * Execute autogen.sh if building from trunk and if no configure is available
+  * Switch to use rpm configure macro and set standard install paths
+  * Build invokation now supports _smp_mflags
+  * Remove install section for docs and use proper doc macro instead
+  * Add tree fixup bits to drop static libs and html docs (only for now)
+  * Add LICENSE file to all subpackages
+  * libraries have moved to libdir. Drop ld.so.conf.d corosync file
+  * Update BuildRoot usage to preferred versions/names
+
 * Tue Mar 10 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.94-5.svn1797
 - Update the corosync-trunk patch for real this time.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Mar 2009 05:48:35 -0000	1.4
+++ sources	24 Mar 2009 07:33:41 -0000	1.5
@@ -1 +1 @@
-5839592fbb6982c6c897aa5020f0b629  corosync-0.94.tar.gz
+24b268b66d95b09f7177c73bb226de74  corosync-0.95.tar.gz


--- corosync-1807.diff DELETED ---


--- corosync-bump-soname.diff DELETED ---


--- corosync-trunk.diff DELETED ---


