rpms/cluster/devel .cvsignore, 1.17, 1.18 cluster.spec, 1.34, 1.35 sources, 1.17, 1.18

[Fabio M. Di Nitto]

Author: fabbione

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

Modified Files:
	.cvsignore cluster.spec sources 
Log Message:
new upstream release + tons of clean up around libs for multiarch support



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	27 Jan 2009 11:09:58 -0000	1.17
+++ .cvsignore	3 Feb 2009 06:19:50 -0000	1.18
@@ -1 +1 @@
-cluster-3.0.0.alpha3.tar.gz
+cluster-3.0.0.alpha4.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- cluster.spec	31 Jan 2009 08:21:19 -0000	1.34
+++ cluster.spec	3 Feb 2009 06:19:50 -0000	1.35
@@ -14,7 +14,7 @@
 # http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
 
 # keep around ready for later user
-%define alphatag alpha3
+%define alphatag alpha4
 
 Name: cluster
 Summary: Red Hat Cluster
@@ -39,8 +39,8 @@
 BuildRequires: perl python
 BuildRequires: glibc-kernheaders glibc-devel
 BuildRequires: libxml2-devel ncurses-devel slang-devel libvolume_id-devel
-BuildRequires: corosync-devel >= 0.92-6 corosync-devel < 0.93
-BuildRequires: openais-devel >= 0.91-5 openais < 0.92
+BuildRequires: corosynclib-devel >= 0.92-7
+BuildRequires: openaislib-devel >= 0.91-6
 BuildRequires: openldap-devel perl(ExtUtils::MakeMaker)
 %if %{buildvirt}
 BuildRequires: nss-devel nspr-devel libvirt-devel xen-libs
@@ -111,8 +111,8 @@
 Requires(post): chkconfig
 Requires(preun): initscripts
 Requires(preun): chkconfig
-Requires: corosync >= 0.92-6 corosync < 0.93
-Requires: openais >= 0.91-5 openais < 0.92
+Requires: corosync >= 0.92-7
+Requires: openais >= 0.91-6
 Requires: sg3_utils OpenIPMI telnet openssh-clients
 Requires: pexpect net-snmp-utils pyOpenSSL
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -159,10 +159,6 @@
 %{_sbindir}/gfs_control*
 %{_sbindir}/group*
 %{_sbindir}/*qdisk*
-%{_libdir}/libccs*.so.*
-%{_libdir}/libdlm*.so.*
-%{_libdir}/libfence*.so.*
-%{_libdir}/liblogthread*.so.*
 %{_datadir}/fence*
 %{_datadir}/snmp/mibs/*
 /usr/libexec/*
@@ -180,55 +176,56 @@
 %{_mandir}/man8/*qdisk*
 %{_mandir}/man3/*.3pm.gz
 
-%package -n cman-devel
+%package -n clusterlib
+Group: System Environment/Libraries
+Summary: The Red Hat Cluster libraries
+Conflicts: cman < 3.0.0-5.alpha4
+Provides: cmanlib = 3.0.0-5.alpha4
+Obsoletes: cmanlib < 3.0.0-5.alpha4
+
+%description -n clusterlib
+The Red Hat Cluster libraries package
+
+%files -n clusterlib
+%defattr(-,root,root,-)
+%doc doc/COPYING.* doc/COPYRIGHT doc/README.licence
+%{_libdir}/libcman.so.*
+%{_libdir}/libccs*.so.*
+%{_libdir}/libdlm*.so.*
+%{_libdir}/libfence*.so.*
+%{_libdir}/liblogthread*.so.*
+
+%post -n clusterlib -p /sbin/ldconfig
+
+%postun -n clusterlib -p /sbin/ldconfig
+
+%package -n clusterlib-devel
 Group: Development/Libraries
-Summary: The Cluster Manager development package
-Requires: cman = %{version}-%{release}
+Summary: The Red Hat Cluster libraries development package
+Requires: clusterlib = %{version}-%{release}
+Requires: pkgconfig
+Provides: cman-devel = 3.0.0-5.alpha4
+Obsoletes: cman-devel < 3.0.0-5.alpha4
+Provides: cmanlib-devel = 3.0.0-5.alpha4
+Obsoletes: cmanlib-devel < 3.0.0-5.alpha4
 
-%files -n cman-devel
+%description -n clusterlib-devel
+The Red Hat Cluster libraries development package
+
+%files -n clusterlib-devel
 %defattr(-,root,root,-)
+%{_libdir}/libcman.so
 %{_libdir}/libccs*.so
 %{_libdir}/libdlm*.so
 %{_libdir}/libfence*.so
 %{_libdir}/liblogthread*.so
 %{_includedir}/ccs.h
+%{_includedir}/libcman.h
 %{_includedir}/libdlm*.h
 %{_includedir}/libfence.h
 %{_includedir}/liblogthread.h
 %{_mandir}/man3/*3.gz
-
-%description -n cman-devel
-The Cluster Manager development package
-
-%package -n cmanlib
-Group: System Environment/Libraries
-Summary: The Cluster Manager library
-Conflicts: cman <= 2.99.10-3
-
-%files -n cmanlib
-%defattr(-,root,root,-)
-%{_libdir}/libcman.so.*
-
-%description -n cmanlib
-The Cluster Manager library package
-
-%post -n cmanlib -p /sbin/ldconfig
-
-%postun -n cmanlib -p /sbin/ldconfig
-
-%package -n cmanlib-devel
-Group: Development/Libraries
-Summary: The Cluster Manager library development package
-Conflicts: cman-devel <= 2.99.10-3
-Requires: cmanlib = %{version}-%{release}
-
-%files -n cmanlib-devel
-%defattr(-,root,root,-)
-%{_includedir}/libcman.h
-%{_libdir}/libcman.so
-
-%description -n cmanlib-devel
-The Cluster Manager library development package
+%{_libdir}/pkgconfig/*.pc
 
 %package -n rgmanager
 Group: System Environment/Base
@@ -327,8 +324,17 @@
 %{_mandir}/man8/*.gfs.*
 
 %changelog
-* Sat Jan 31 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-5.alpha3
-- Fix directory ownership. #483330
+* Sat Jan 31 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-5.alpha4
+- New upstream release.
+- Fix directory ownership #483330.
+- Add support pkgconfig to devel package.
+- Total libraries cleanup:
+  - split libraries out of cman into clusterlib.
+  - merge cmanlib into clusterlib.
+  - rename cman-devel into clusterlib-devel.
+  - merge cmanlib-devel into clusterlib-devel.
+- Comply with multiarch requirements (libraries).
+- Relax BuildRequires and Requires around corosync and openais.
 
 * Tue Jan 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-4.alpha3
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	27 Jan 2009 11:09:59 -0000	1.17
+++ sources	3 Feb 2009 06:19:50 -0000	1.18
@@ -1 +1 @@
-7336dd3ca3bd117a4b81e91a6700be58  cluster-3.0.0.alpha3.tar.gz
+c5041644159bf2926c6ea8fb696fccad  cluster-3.0.0.alpha4.tar.gz