rpms/qpidc/devel qpidc.spec,1.40,1.41

[Nuno Santos]

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18221

Modified Files:
	qpidc.spec 
Log Message:
recover proper specfile for trunk


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- qpidc.spec	2 Oct 2008 19:08:44 -0000	1.40
+++ qpidc.spec	2 Oct 2008 19:35:51 -0000	1.41
@@ -10,7 +10,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           qpidc
-Version: 	0.3.%{?svnrev}
+Version: 	0.3.700546
 Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
@@ -27,7 +27,6 @@
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: ruby
-BuildRequires: python
 
 Requires: boost
 
@@ -57,7 +56,6 @@
 Summary: An AMQP message broker daemon
 Group: System Environment/Daemons
 Requires: %name = %version-%release
-Requires: openais
 Requires: xqilla
 Requires: xerces-c
 Requires: cyrus-sasl
@@ -66,7 +64,6 @@
 BuildRequires: cyrus-sasl
 BuildRequires: xqilla-devel
 BuildRequires: xerces-c-devel
-BuildRequires: openais-devel
 
 %description -n %{qpidd}
 A message broker daemon that receives stores and routes messages using
@@ -99,7 +96,41 @@
 Requires: %{qmf} = %version-%release
 
 %description -n %{qmf}-devel
-Header files and code-generation tools needed for developers of QMF-managed components.
+Header files and code-generation tools needed for developers of QMF-managed
+components.
+
+%package rdma
+Summary: RDMA Protocol support (including Infiniband) for Qpid clients
+Group: System Environment/Libraries
+Requires: %name = %version-%release
+BuildRequires: libibverbs-devel
+BuildRequires: librdmacm-devel
+
+%description rdma
+A client plugin and support library to support RDMA protocols (including
+Infiniband) as the transport for Qpid messaging.
+
+%package -n %{qpidd}-rdma
+Summary: RDMA Protocol support (including Infiniband) for the Qpid daemon
+Group: System Environment/Libraries
+Requires: %{qpidd} = %version-%release
+Requires: %name-rdma
+BuildRequires: libibverbs-devel
+BuildRequires: librdmacm-devel
+
+%description -n %{qpidd}-rdma
+A Qpid daemon plugin to support RDMA protocols (including Infiniband) as the
+transport for AMQP messaging.
+
+%package -n %{qpidd}-cluster
+Summary: Cluster support for the Qpid daemon
+Group: System Environment/Daemons
+Requires: %{qpidd} = %version-%release
+Requires: openais
+BuildRequires: openais-devel
+
+%description -n %{qpidd}-cluster
+A Qpid daemon plugin enabling broker clustering using openais
 
 %package perftest
 Summary: Simple benchmarking tools
@@ -154,6 +185,9 @@
 rm -f %{buildroot}%_libdir/*.a
 rm -f %{buildroot}%_libdir/*.l
 rm -f %{buildroot}%_libdir/*.la
+rm -f %{buildroot}%_libdir/librdmawrap.so
+rm -f %{buildroot}%_libdir/qpid/client/*.la
+rm -f %{buildroot}%_libdir/qpid/daemon/*.la
 # remove examples, are being packages separately in the rhm-docs package
 rm -fr %{buildroot}/usr/share/qpidc/examples
 
@@ -170,6 +204,7 @@
 %_libdir/libqpidcommon.so.0.1.0
 %_libdir/libqpidclient.so.0
 %_libdir/libqpidclient.so.0.1.0
+%config(noreplace) %_sysconfdir/qpid/qpidc.conf
 
 %files devel
 %defattr(-,root,root,-)
@@ -181,6 +216,7 @@
 %_includedir/qpid/log
 %_includedir/qpid/management
 %_includedir/qpid/agent
+%_includedir/qmf
 %_libdir/libqpidcommon.so
 %_libdir/libqpidclient.so
 %doc docs/api/html
@@ -189,7 +225,6 @@
 %defattr(-,root,root,-)
 %_libdir/libqpidbroker.so.0
 %_libdir/libqpidbroker.so.0.1.0
-%_libdir/qpid/daemon/cluster.so
 %_libdir/qpid/daemon/acl.so
 %_sbindir/%{qpidd}
 %config(noreplace) %_sysconfdir/qpidd.conf
@@ -219,6 +254,21 @@
 %_bindir/qmf-gen
 %{python_sitelib}/qmf
 
+%files rdma
+%defattr(-,root,root,-)
+%_libdir/librdmawrap.so.0
+%_libdir/librdmawrap.so.0.1.0
+%_libdir/qpid/client/rdmaconnector.so
+%config(noreplace) %_sysconfdir/qpid/qpidc.conf
+
+%files -n %{qpidd}-rdma
+%defattr(-,root,root,-)
+%_libdir/qpid/daemon/rdma.so
+
+%files -n %{qpidd}-cluster
+%defattr(-,root,root,-)
+%_libdir/qpid/daemon/cluster.so
+
 %files perftest
 %defattr(755,root,root,-)
 %_bindir/perftest
@@ -264,15 +314,22 @@
 fi
 /sbin/ldconfig
 
+%post rdma -p /sbin/ldconfig
+
+%postun rdma -p /sbin/ldconfig
+
+%post -n %{qmf} -p /sbin/ldconfig
+
+%postun -n %{qmf} -p /sbin/ldconfig
+
 %changelog
 * Thu Oct  2 2008 Nuno Santos <nsantos at redhat.com> - 0.3.700546-1
 - Rebased to svn revision 700546
 
-* Tue Sep  9 2008 Nuno Santos <nsantos at redhat.com> - 0.3.693548-1
-- Include latest changes to qmf
-
-* Mon Sep  8 2008 Nuno Santos <nsantos at redhat.com> - 0.3.693140-1
-- Update for Fedora 10
+* Thu Sep 11 2008 Andrew Stitcher <astitcher at redhat.com> - 0.3.694455-1
+- Add new packages for client & broker rdma
+- Move cluster plugin into its own package
+- Reflect new naming of plugins
 
 * Wed Aug 21 2008 Justin Ross <jross at redhat.com> - 0.2.687156-1
 - Update to source revision 687156 of the qpid.0-10 branch