rpms/qpidc/devel qpidc.spec,1.36,1.37

[Nuno Santos]

Author: nsantos

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

Modified Files:
	qpidc.spec 
Log Message:
add qmf subpackage


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- qpidc.spec	8 Sep 2008 17:05:03 -0000	1.36
+++ qpidc.spec	8 Sep 2008 17:49:24 -0000	1.37
@@ -4,10 +4,13 @@
 # svn revision: $Rev: 654927 $
 #
 %define qpidd qpidd
+%define qmf qmf
 %define svnrev 693140
 
+%{!?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.%{?svnrev}
 Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
@@ -19,7 +22,6 @@
 ExclusiveArch: i386 i686 x86_64
 
 BuildRequires: boost-devel
-BuildRequires: cppunit-devel
 BuildRequires: doxygen
 BuildRequires: e2fsprogs-devel
 BuildRequires: libtool
@@ -83,6 +85,22 @@
 Libraries and header files for developing extensions to the
 Qpid broker daemon.
 
+%package -n %{qmf}
+Summary: The QPID Management Framework
+Group: System Environment/Daemons
+Requires: %name = %version-%release
+
+%description -n %{qmf}
+An extensible managememt framework layered on QPID messaging.
+
+%package -n %{qmf}-devel
+Summary: Header files and tools for developing QMF extensions
+Group: Development/System
+Requires: %{qmf} = %version-%release
+
+%description -n %{qmf}-devel
+Header files and code-generation tools needed for developers of QMF-managed components.
+
 %package perftest
 Summary: Simple benchmarking tools
 Group: System Environment/Tools
@@ -94,13 +112,18 @@
 %pre
 getent group qpidd >/dev/null || groupadd -r qpidd
 getent passwd qpidd >/dev/null || \
-  useradd -r -m -g qpidd -d %{_localstatedir}/lib/qpidd -s /sbin/nologin \
+  useradd -r -M -g qpidd -d %{_localstatedir}/lib/qpidd -s /sbin/nologin \
     -c "Owner of Qpidd Daemons" qpidd
 exit 0
 
 %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"
+
 %build
 CXXFLAGS="%{optflags} -DNDEBUG -O3" \
 %configure --disable-static --without-cpg --without-graphviz --without-help2man
@@ -109,7 +132,9 @@
 rm docs/api/html/installdox
 # Make perftest utilities
 pushd src/tests
-make perftest topic_listener topic_publisher latencytest
+for ptest in %{perftests}; do
+  make $ptest
+done
 popd
 
 %install
@@ -122,10 +147,9 @@
 install -d -m0755 %{buildroot}/var/run/qpidd
 # Install perftest utilities
 pushd %{_builddir}/%{name}-%{version}/src/tests/
-libtool --mode=install install -m755 perftest %{buildroot}/%_bindir
-libtool --mode=install install -m755 topic_listener %{buildroot}/%_bindir
-libtool --mode=install install -m755 topic_publisher %{buildroot}/%_bindir
-libtool --mode=install install -m755 latencytest %{buildroot}/%_bindir
+for ptest in %{perftests}; do
+  libtool --mode=install install -m755 $ptest %{buildroot}/%_bindir
+done
 popd
 rm -f %{buildroot}%_libdir/*.a
 rm -f %{buildroot}%_libdir/*.l
@@ -156,10 +180,9 @@
 %_includedir/qpid/sys
 %_includedir/qpid/log
 %_includedir/qpid/management
+%_includedir/qpid/agent
 %_libdir/libqpidcommon.so
 %_libdir/libqpidclient.so
-%_bindir/managementgen
-%_datadir/managementgen
 %doc docs/api/html
 
 %files -n %{qpidd}
@@ -168,6 +191,8 @@
 %_libdir/libqpidbroker.so.0.1.0
 %_libdir/libqpidcluster.so.0
 %_libdir/libqpidcluster.so.0.1.0
+%_libdir/libqpidacl.so.0
+%_libdir/libqpidacl.so.0.1.0
 %_sbindir/%{qpidd}
 %config(noreplace) %_sysconfdir/qpidd.conf
 %config(noreplace) %_sysconfdir/sasl2/qpidd.conf
@@ -180,17 +205,46 @@
 
 %files -n %{qpidd}-devel
 %defattr(-,root,root,-)
-%doc rpm/README.qpidd-devel
+#%doc rpm/README.qpidd-devel
 %defattr(-,root,root,-)
 %_libdir/libqpidbroker.so
 %_libdir/libqpidcluster.so
+%_libdir/libqpidacl.so
 %_includedir/qpid/broker
 
+%files -n %{qmf}
+%defattr(-,root,root,-)
+%_libdir/libqmfagent.so.0
+%_libdir/libqmfagent.so.0.1.0
+
+%files -n %{qmf}-devel
+%defattr(-,root,root,-)
+%_libdir/libqmfagent.so
+%_bindir/qmf-gen
+%{python_sitelib}/qmf
+
 %files perftest
+%defattr(755,root,root,-)
 %_bindir/perftest
 %_bindir/topic_listener
 %_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
 
@@ -218,11 +272,22 @@
 * Mon Sep  8 2008 Nuno Santos <nsantos at redhat.com> - 0.3.693140-1
 - Update for Fedora 10
 
-* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.667603-3
-- fix license tag
+* 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
+
+* Wed Aug 14 2008 Justin Ross <jross at redhat.com> - 0.2.685273-1
+- Update to source revision 685273 of the qpid.0-10 branch
+
+* Wed Aug  6 2008 Justin Ross <jross at redhat.com> - 0.2.683301-1
+- Update to source revision 683301 of the qpid.0-10 branch
+
+* Thu Jul 15 2008 Justin Ross <jross at redhat.com> - 0.2.676581-1
+- Update to source revision 676581 of the qpid.0-10 branch
+- Work around home dir creation problem
+- Use a license string that rpmlint likes
 
-* Tue Jul  7 2008 Nuno Santos <nsantos at redhat.com> - 0.2.667603-2
-- MRG GA release
+* Thu Jul 10 2008 Nuno Santos <nsantos at redhat.com> - 0.2.667603-3
+- BZ453818: added additional tests to -perftest
 
 * Thu Jun 13 2008 Justin Ross <jross at redhat.com> - 0.2.667603-1
 - Update to source revision 667603