rpms/qpidc/F-10 qpidc.spec,1.47,1.48

[Nuno Santos]

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19932

Modified Files:
	qpidc.spec 
Log Message:
fixes to qmfgen


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-10/qpidc.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- qpidc.spec	26 Nov 2008 17:35:52 -0000	1.47
+++ qpidc.spec	26 Nov 2008 19:20:44 -0000	1.48
@@ -1,12 +1,12 @@
 #
-# Spec file for Qpid C++ packages: qpidc qpidc-devel, qpidd, qpidd-devel
+# Spec file for Qpid C++ packages: qpidc, qpidc-devel, qpidd, qpidd-devel
 # svn revision: $Rev: 654927 $
 #
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           qpidc
-Version: 	0.3.720585
+Version:        0.3.720585
 Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
@@ -21,7 +21,6 @@
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: ruby
-BuildRequires: python
 BuildRequires: cyrus-sasl-devel
 BuildRequires: cyrus-sasl-lib
 BuildRequires: cyrus-sasl
@@ -32,6 +31,7 @@
 BuildRequires: xqilla-devel
 BuildRequires: xerces-c-devel
 BuildRequires: openais-devel
+BuildRequires: cman-devel
 
 Requires: boost
 
@@ -156,7 +156,9 @@
 Summary: Cluster support for the Qpid daemon
 Group: System Environment/Daemons
 Requires: qpidd = %version-%release
+Requires: qpidc = %version-%release
 Requires: openais
+Requires: cman
 
 %description -n qpidd-cluster
 A Qpid daemon plugin enabling broker clustering using openais
@@ -179,15 +181,17 @@
 %prep
 %setup -q
 
-%define perftests "perftest txtest client_test \
-  latencytest topic_listener topic_publisher"
+%define perftests "perftest topic_listener topic_publisher \
+	latencytest client_test txtest"
 
 %build
 CXXFLAGS="%{optflags} -DNDEBUG -O3" \
-%configure --disable-static --without-graphviz --without-help2man
+%configure --disable-static --with-cpg --without-graphviz --without-help2man
 make #%{?_smp_mflags}
 # Remove this generated perl file, we don't need it and it upsets rpmlint.
-rm -f docs/api/html/installdox
+# This is generating an error as of 21 Nov 08 becausethe file doesn't exist .
+# rm docs/api/html/installdox
+
 # Make perftest utilities
 pushd src/tests
 for ptest in %{perftests}; do
@@ -213,6 +217,7 @@
 rm -f %{buildroot}%_libdir/*.l
 rm -f %{buildroot}%_libdir/*.la
 rm -f %{buildroot}%_libdir/librdmawrap.so
+rm -f %{buildroot}%_libdir/libsslcommon.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
@@ -265,6 +270,7 @@
 
 %files -n qpidd-devel
 %defattr(-,root,root,-)
+%defattr(-,root,root,-)
 %_libdir/libqpidbroker.so
 %_includedir/qpid/broker
 
@@ -277,7 +283,7 @@
 %defattr(-,root,root,-)
 %_libdir/libqmfagent.so
 %_bindir/qmf-gen
-%{python_sitelib}/qmf
+%{python_sitelib}/qmfgen
 
 %files -n qpidd-acl
 %defattr(-,root,root,-)
@@ -286,7 +292,7 @@
 %files rdma
 %defattr(-,root,root,-)
 %_libdir/librdmawrap.so.0
-%_libdir/librdmawrap.so.0.0.0
+%_libdir/librdmawrap.so.0.1.0
 %_libdir/qpid/client/rdmaconnector.so
 %config(noreplace) %_sysconfdir/qpid/qpidc.conf
 
@@ -319,6 +325,20 @@
 %_bindir/topic_publisher
 %_bindir/latencytest
 %_bindir/client_test
+%_bindir/fanout_perftest
+%_bindir/multiq_perftest
+%_bindir/python_tests
+%_bindir/quick_perftest
+%_bindir/quick_topictest
+%_bindir/run-unit-tests
+%_bindir/run_federation_tests
+%_bindir/run_perftest
+%_bindir/run_test
+%_bindir/shared_perftest
+%_bindir/start_broker
+%_bindir/stop_broker
+%_bindir/topic_perftest
+%_bindir/topictest
 %_bindir/txtest
 
 %post -p /sbin/ldconfig
@@ -356,21 +376,53 @@
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
-* Tue Nov 25 2008 Nuno Santos <nsantos at redhat.com> - 0.3.720585-1
+* Wed Nov 26 2008 Nuno Santos <nsantos at redhat.com> - 0.3.720585-1
 - Rebased to svn rev 720585
 
-* Tue Nov 18 2008 Nuno Santos <nsantos at redhat.com> - 0.3.718718-1
-- Rebased to svn rev 718718
+* Fri Nov 21 2008  Mick Goulish <mgoulish at redhat.com>
+- updated to 719552
+
+* Thu Nov 20 2008  Mick Goulish <mgoulish at redhat.com>
+- updated to 719323
+- For subpackage qpidd-cluster, added dependency to cman-devel.
+- For subpackage qpidd-cluster, added dependency to qpidc.
+- added BuildRequires cman-devel
+
+* Fri Nov 14 2008 Justin Ross <jross at redhat.com> - 0.3.714072-1
+- Update to svn rev 714072
+- Enable building --with-cpg
+
+* Wed Nov 12 2008 Justin Ross <jross at redhat.com> - 0.3.713378-1
+- Update to svn rev 713378
+
+* Fri Nov  7 2008 Justin Ross <jross at redhat.com> - 0.3.712127-1
+- Update to svn rev 712127
 
-* Thu Oct 16 2008 Nuno Santos <nsantos at redhat.com> - 0.3.705289-1
-- Rebased to svn rev 705289
+* Thu Nov  6 2008 Nuno Santos <nsantos at redhat.com> - 0.3.711915-2
+- Removed extraneous openais-devel dependency
 
-* Thu Oct  2 2008 Nuno Santos <nsantos at redhat.com> - 0.3.700546-1
-- Rebased to svn revision 700546
+* Thu Nov  6 2008 Justin Ross <jross at redhat.com> - 0.3.711915-1
+- Update to svn rev 711915
 
-* 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
+* Tue Nov  4 2008 Nuno Santos <nsantos at redhat.com> - 0.3.709187-2
+- Remove extraneous dependency
+
+* Thu Oct 30 2008 Nuno Santos <nsantos at redhat.com> - 0.3.709187-1
+- Rebsed to svn rev 709187
+
+* Tue Oct 28 2008 Nuno Santos <nsantos at redhat.com> - 0.3.708576-1
+- Rebased to svn rev 708576
+
+* Mon Oct 27 2008 Nuno Santos <nsantos at redhat.com> - 0.3.708210-1
+- Rebased to svn rev 708210; address make check libtool issue
+
+* Fri Oct 24 2008 Justin Ross <jross at redhat.com> - 0.3.707724-1
+- Update to revision 707724
+
+* Thu Oct 23 2008 Justin Ross <jross at redhat.com> - 0.3.707468-1
+- Don't use silly idenity defines
+- Add new ssl and rdma subpackages
+- Move cluster and xml plugins into their own subpackages
 - Reflect new naming of plugins
 
 * Wed Aug 21 2008 Justin Ross <jross at redhat.com> - 0.2.687156-1
@@ -526,4 +578,3 @@
 * Fri Dec  8 2006 David Lutterkort <dlutter at redhat.com> - 0.1-1
 - Initial version based on Jim Meyering's sketch and discussions with Alan
   Conway
-