rpms/qpidc/F-9 .cvsignore, 1.10, 1.11 qpidc.spec, 1.39, 1.40 sources, 1.24, 1.25

Nuno Santos nsantos at fedoraproject.org
Wed Nov 26 16:32:29 UTC 2008


Author: nsantos

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	18 Nov 2008 23:50:55 -0000	1.10
+++ .cvsignore	26 Nov 2008 16:31:58 -0000	1.11
@@ -1 +1 @@
-qpidc-0.3.718718.tar.gz
+qpidc-0.3.720585.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-9/qpidc.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- qpidc.spec	19 Nov 2008 00:48:23 -0000	1.39
+++ qpidc.spec	26 Nov 2008 16:31:58 -0000	1.40
@@ -1,16 +1,12 @@
-
 #
 # Spec file for Qpid C++ packages: qpidc qpidc-devel, qpidd, qpidd-devel
 # svn revision: $Rev: 654927 $
 #
-%define qpidd qpidd
-%define qmf qmf
-%define svnrev 718718
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           qpidc
-Version: 	0.3.718718
+Version: 	0.3.720585
 Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
@@ -24,15 +20,17 @@
 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: xqilla-devel
-BuildRequires: xerces-c-devel
 BuildRequires: libibverbs-devel
 BuildRequires: librdmacm-devel
+BuildRequires: nss-devel
+BuildRequires: nspr-devel
+BuildRequires: xqilla-devel
+BuildRequires: xerces-c-devel
 BuildRequires: openais-devel
 
 Requires: boost
@@ -59,48 +57,52 @@
 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
 
-%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-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
@@ -110,23 +112,53 @@
 A client plugin and support library to support RDMA protocols (including
 Infiniband) as the transport for Qpid messaging.
 
-%package -n %{qpidd}-rdma
+%package -n qpidd-rdma
 Summary: RDMA Protocol support (including Infiniband) for the Qpid daemon
 Group: System Environment/Libraries
-Requires: %{qpidd} = %version-%release
+Requires: qpidd = %version-%release
 Requires: %name-rdma
 
-%description -n %{qpidd}-rdma
+%description -n qpidd-rdma
 A Qpid daemon plugin to support RDMA protocols (including Infiniband) as the
 transport for AMQP messaging.
 
-%package -n %{qpidd}-cluster
+%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: openais
 
-%description -n %{qpidd}-cluster
+%description -n qpidd-cluster
 A Qpid daemon plugin enabling broker clustering using openais
 
 %package perftest
@@ -147,10 +179,8 @@
 %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 txtest client_test \
+  latencytest topic_listener topic_publisher"
 
 %build
 CXXFLAGS="%{optflags} -DNDEBUG -O3" \
@@ -192,7 +222,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,-)
@@ -218,40 +249,40 @@
 %_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
-%defattr(-,root,root,-)
-#%doc rpm/README.qpidd-devel
+%files -n 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
 
+%files -n qpidd-acl
+%defattr(-,root,root,-)
+%_libdir/qpid/daemon/acl.so
+
 %files rdma
 %defattr(-,root,root,-)
 %_libdir/librdmawrap.so.0
@@ -259,11 +290,25 @@
 %_libdir/qpid/client/rdmaconnector.so
 %config(noreplace) %_sysconfdir/qpid/qpidc.conf
 
-%files -n %{qpidd}-rdma
+%files -n qpidd-rdma
 %defattr(-,root,root,-)
 %_libdir/qpid/daemon/rdma.so
 
-%files -n %{qpidd}-cluster
+%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
 
@@ -274,39 +319,25 @@
 %_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
@@ -316,11 +347,18 @@
 
 %postun rdma -p /sbin/ldconfig
 
-%post -n %{qmf} -p /sbin/ldconfig
+%post ssl -p /sbin/ldconfig
+
+%postun ssl -p /sbin/ldconfig
 
-%postun -n %{qmf} -p /sbin/ldconfig
+%post -n qmf -p /sbin/ldconfig
+
+%postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Tue Nov 25 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-9/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	18 Nov 2008 23:50:55 -0000	1.24
+++ sources	26 Nov 2008 16:31:58 -0000	1.25
@@ -1 +1 @@
-73dc02da81df1b90bbffe18dc9911fb1  qpidc-0.3.718718.tar.gz
+3a0851658e65274d315a80e0de7cba51  qpidc-0.3.720585.tar.gz




More information about the fedora-extras-commits mailing list