rpms/qpidc/F-8 .cvsignore, 1.9, 1.10 qpidc.spec, 1.20, 1.21 sources, 1.16, 1.17

Nuno Santos nsantos at fedoraproject.org
Wed Nov 26 23:32:22 UTC 2008


Author: nsantos

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

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
Rebased to svn rev 720979


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	16 Oct 2008 20:01:46 -0000	1.9
+++ .cvsignore	26 Nov 2008 23:31:51 -0000	1.10
@@ -1 +1 @@
-qpidc-0.3.705289.tar.gz
+qpidc-0.3.720979.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-8/qpidc.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- qpidc.spec	16 Oct 2008 20:01:46 -0000	1.20
+++ qpidc.spec	26 Nov 2008 23:31:51 -0000	1.21
@@ -1,16 +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 $
 #
-%define qpidd qpidd
-%define qmf qmf
-%define svnrev 705289
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           qpidc
-Version: 	0.3.705289
+Version:        0.3.720979
 Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
@@ -19,15 +15,24 @@
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExclusiveArch: i386 i686 x86_64
-
 BuildRequires: boost-devel
 BuildRequires: doxygen
 BuildRequires: e2fsprogs-devel
 BuildRequires: libtool
 BuildRequires: pkgconfig
-BuildRequires: python
 BuildRequires: ruby
+BuildRequires: python
+BuildRequires: cyrus-sasl-devel
+BuildRequires: cyrus-sasl-lib
+BuildRequires: cyrus-sasl
+BuildRequires: libibverbs-devel
+BuildRequires: librdmacm-devel
+BuildRequires: nss-devel
+BuildRequires: nspr-devel
+BuildRequires: xqilla-devel
+BuildRequires: xerces-c-devel
+BuildRequires: openais-devel
+BuildRequires: cman-devel
 
 Requires: boost
 
@@ -53,61 +58,110 @@
 Libraries, header files and documentation for developing AMQP clients
 in C++ using Qpid.  Qpid implements the AMQP messaging specification.
 
-%package -n %{qpidd}
+%package -n qpidd
 Summary: An AMQP message broker daemon
 Group: System Environment/Daemons
 Requires: %name = %version-%release
-Requires: xqilla
-Requires: xerces-c
 Requires: cyrus-sasl
-BuildRequires: cyrus-sasl-devel
-BuildRequires: cyrus-sasl-lib
-BuildRequires: cyrus-sasl
-BuildRequires: xqilla-devel
-BuildRequires: xerces-c-devel
 
-%description -n %{qpidd}
+%description -n qpidd
 A message broker daemon that receives stores and routes messages using
 the open AMQP messaging protocol.
 
-%package -n %{qpidd}-devel
+%package -n qpidd-devel
 Summary: Libraries and header files for developing Qpid broker extensions
 Group: Development/System
 Requires: %name-devel = %version-%release
-Requires: %{qpidd} = %version-%release
-Requires: openais-devel
+Requires: qpidd = %version-%release
 Requires: boost-devel
-Requires: xqilla-devel
 
-%description -n %{qpidd}-devel
+%description -n qpidd-devel
 Libraries and header files for developing extensions to the
 Qpid broker daemon.
 
-%package -n %{qmf}
+%package -n qmf
 Summary: The QPID Management Framework
 Group: System Environment/Daemons
 Requires: %name = %version-%release
 
-%description -n %{qmf}
+%description -n qmf
 An extensible managememt framework layered on QPID messaging.
 
-%package -n %{qmf}-devel
+%package -n qmf-devel
 Summary: Header files and tools for developing QMF extensions
 Group: Development/System
-Requires: %{qmf} = %version-%release
+Requires: qmf = %version-%release
 
-%description -n %{qmf}-devel
+%description -n qmf-devel
 Header files and code-generation tools needed for developers of QMF-managed
 components.
 
-%package -n %{qpidd}-cluster
+%package -n qpidd-acl
+Summary: ACL based security for the Qpid daemon
+Group: System Environment/Libraries
+Requires: qpidd = %version-%release
+
+%description -n qpidd-acl
+A Qpid daemon plugin to support ACL-based access control.
+
+%package rdma
+Summary: RDMA Protocol support (including Infiniband) for Qpid clients
+Group: System Environment/Libraries
+Requires: %name = %version-%release
+
+%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
+
+%description -n qpidd-rdma
+A Qpid daemon plugin to support RDMA protocols (including Infiniband) as the
+transport for AMQP messaging.
+
+%package ssl
+Summary: SSL support for Qpid clients
+Group: System Environment/Libraries
+Requires: %name = %version-%release
+
+%description ssl
+A client plugin and support library to support SSL as the transport
+for Qpid messaging.
+
+%package -n qpidd-ssl
+Summary: SSL support for the Qpid daemon
+Group: System Environment/Libraries
+Requires: qpidd = %version-%release
+Requires: %name-ssl
+
+%description -n qpidd-ssl
+A Qpid daemon plugin to support SSL as the transport for AMQP
+messaging.
+
+%package -n qpidd-xml
+Summary: XML extensions for the Qpid daemon
+Group: System Environment/Libraries
+Requires: qpidd = %version-%release
+Requires: xqilla
+Requires: xerces-c
+
+%description -n qpidd-xml
+A Qpid daemon plugin to support extended XML-based routing of AMQP
+messages.
+
+%package -n qpidd-cluster
 Summary: Cluster support for the Qpid daemon
 Group: System Environment/Daemons
-Requires: %{qpidd} = %version-%release
+Requires: qpidd = %version-%release
+Requires: qpidc = %version-%release
 Requires: openais
-BuildRequires: openais-devel
+Requires: cman
 
-%description -n %{qpidd}-cluster
+%description -n qpidd-cluster
 A Qpid daemon plugin enabling broker clustering using openais
 
 %package perftest
@@ -128,17 +182,17 @@
 %prep
 %setup -q
 
-%define perftests "perftest topic_listener topic_publisher latencytest \
-  client_test fanout_perftest multiq_perftest python_tests quick_perftest \
-  quick_topictest run_federation_tests run_perftest run_test run-unit-tests \
-  shared_perftest start_broker stop_broker topic_perftest topictest txtest"
+%define perftests "perftest topic_listener topic_publisher \
+	latencytest client_test txtest"
 
 %build
 CXXFLAGS="%{optflags} -DNDEBUG -O3" \
-%configure --disable-static --without-cpg --without-graphviz --without-help2man
-make %{?_smp_mflags}
+%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 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
@@ -163,7 +217,8 @@
 rm -f %{buildroot}%_libdir/*.a
 rm -f %{buildroot}%_libdir/*.l
 rm -f %{buildroot}%_libdir/*.la
-rm -f %{buildroot}%_libdir/librdma*
+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
@@ -173,7 +228,8 @@
 rm -rf %{buildroot}
 
 %check
-make check
+# LANG=C needs to be in the environment to deal with a libtool issue
+LANG=C make check
 
 %files
 %defattr(-,root,root,-)
@@ -199,41 +255,67 @@
 %_libdir/libqpidclient.so
 %doc docs/api/html
 
-%files -n %{qpidd}
+%files -n qpidd
 %defattr(-,root,root,-)
 %_libdir/libqpidbroker.so.0
 %_libdir/libqpidbroker.so.0.1.0
-%_libdir/qpid/daemon/acl.so
-%_libdir/qpid/daemon/xml.so
-%_sbindir/%{qpidd}
+%_sbindir/qpidd
 %config(noreplace) %_sysconfdir/qpidd.conf
 %config(noreplace) %_sysconfdir/sasl2/qpidd.conf
-%{_initrddir}/%{qpidd}
+%{_initrddir}/qpidd
 %attr(755, qpidd, qpidd) %_localstatedir/lib/qpidd
 %attr(755, qpidd, qpidd) %_libdir/qpidd
 %attr(755, qpidd, qpidd) /var/run/qpidd
 %attr(600, qpidd, qpidd) %config(noreplace) %_localstatedir/lib/qpidd/qpidd.sasldb
-%doc %_mandir/man1/%{qpidd}.*
+%doc %_mandir/man1/qpidd.*
 
-%files -n %{qpidd}-devel
+%files -n qpidd-devel
 %defattr(-,root,root,-)
-#%doc rpm/README.qpidd-devel
 %defattr(-,root,root,-)
 %_libdir/libqpidbroker.so
 %_includedir/qpid/broker
 
-%files -n %{qmf}
+%files -n qmf
 %defattr(-,root,root,-)
 %_libdir/libqmfagent.so.0
 %_libdir/libqmfagent.so.0.1.0
 
-%files -n %{qmf}-devel
+%files -n qmf-devel
 %defattr(-,root,root,-)
 %_libdir/libqmfagent.so
 %_bindir/qmf-gen
-%{python_sitelib}/qmf
+%{python_sitelib}/qmfgen
 
-%files -n %{qpidd}-cluster
+%files -n qpidd-acl
+%defattr(-,root,root,-)
+%_libdir/qpid/daemon/acl.so
+
+%files rdma
+%defattr(-,root,root,-)
+%_libdir/librdmawrap.so.0
+%_libdir/librdmawrap.so.0.0.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 ssl
+%defattr(-,root,root,-)
+%_libdir/libsslcommon.so.0
+%_libdir/libsslcommon.so.0.1.0
+%_libdir/qpid/client/sslconnector.so
+
+%files -n qpidd-ssl
+%defattr(-,root,root,-)
+%_libdir/qpid/daemon/ssl.so
+
+%files -n qpidd-xml
+%defattr(-,root,root,-)
+%_libdir/qpid/daemon/xml.so
+
+%files -n qpidd-cluster
 %defattr(-,root,root,-)
 %_libdir/qpid/daemon/cluster.so
 
@@ -244,58 +326,90 @@
 %_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
 
 %postun -p /sbin/ldconfig
 
-%post -n %{qpidd}
+%post -n qpidd
 # This adds the proper /etc/rc*.d links for the script
 /sbin/chkconfig --add qpidd
 /sbin/ldconfig
 
-%preun -n %{qpidd}
+%preun -n qpidd
 # Check that this is actual deinstallation, not just removing for upgrade.
 if [ $1 = 0 ]; then
         /sbin/service qpidd stop >/dev/null 2>&1 || :
         /sbin/chkconfig --del qpidd
 fi
 
-%postun -n %{qpidd}
+%postun -n qpidd
 if [ "$1" -ge "1" ]; then
         /sbin/service qpidd condrestart >/dev/null 2>&1 || :
 fi
 /sbin/ldconfig
 
-%post -n %{qmf} -p /sbin/ldconfig
+%post rdma -p /sbin/ldconfig
+
+%postun rdma -p /sbin/ldconfig
 
-%postun -n %{qmf} -p /sbin/ldconfig
+%post ssl -p /sbin/ldconfig
+
+%postun ssl -p /sbin/ldconfig
+
+%post -n qmf -p /sbin/ldconfig
+
+%postun -n qmf -p /sbin/ldconfig
 
 %changelog
-* Thu Oct 16 2008 Nuno Santos <nsantos at redhat.com> - 0.3.705289-1
-- Rebased to svn rev 705289
+* Wed Nov 26 2008 Nuno Santos <nsantos at redhat.com> - 0.3.720979-1
+- Rebased to svn rev 720979
+
+* 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  2 2008 Nuno Santos <nsantos at redhat.com> - 0.3.700546-2
-- Rebased to svn revision 700546; removed RDMA support
+* Thu Nov  6 2008 Nuno Santos <nsantos at redhat.com> - 0.3.711915-2
+- Removed extraneous openais-devel dependency
 
-* 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
+* Thu Nov  6 2008 Justin Ross <jross at redhat.com> - 0.3.711915-1
+- Update to svn rev 711915
+
+* 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
@@ -451,4 +565,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
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-8/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	16 Oct 2008 20:01:46 -0000	1.16
+++ sources	26 Nov 2008 23:31:51 -0000	1.17
@@ -1 +1 @@
-c509b51a6ffa4016d879590495557211  qpidc-0.3.705289.tar.gz
+6c3a13540c2d7af010b8a6d205e75268  qpidc-0.3.720979.tar.gz




More information about the fedora-extras-commits mailing list