rpms/qpidc/devel examples.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 qpidc.spec, 1.31, 1.32 sources, 1.19, 1.20

[Nuno Santos (nsantos)]

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2760

Modified Files:
	.cvsignore qpidc.spec sources 
Added Files:
	examples.patch 
Log Message:
importing qpidc-0.2.667603

examples.patch:

--- NEW FILE examples.patch ---
--- qpidc-0.2.667253/Makefile.in.orig	2008-06-12 22:28:35.000000000 -0400
+++ qpidc-0.2.667253/Makefile.in	2008-06-12 22:29:53.000000000 -0400
@@ -211,7 +211,7 @@
   rpm/README.qpidd-devel \
   xml/cluster.xml
 
-SUBDIRS = managementgen etc src docs/api docs/man examples
+SUBDIRS = managementgen etc src docs/api docs/man
 
 #
 # Build RPMs from the distribution tarball.
--- qpidc-0.2.667253/configure.orig	2008-06-12 22:29:13.000000000 -0400
+++ qpidc-0.2.667253/configure	2008-06-12 22:30:56.000000000 -0400
@@ -22875,7 +22875,7 @@
 
 
 # Files to generate
-                                                                                                              ac_config_files="$ac_config_files qpidc.spec Makefile examples/Makefile managementgen/Makefile etc/Makefile src/Makefile src/tests/Makefile docs/man/Makefile docs/api/Makefile docs/api/user.doxygen docs/api/developer.doxygen"
+                                                                                                              ac_config_files="$ac_config_files qpidc.spec Makefile managementgen/Makefile etc/Makefile src/Makefile src/tests/Makefile docs/man/Makefile docs/api/Makefile docs/api/user.doxygen docs/api/developer.doxygen"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
--- qpidc-0.2.667253/configure.ac.orig	2008-06-12 22:28:44.000000000 -0400
+++ qpidc-0.2.667253/configure.ac	2008-06-12 22:30:09.000000000 -0400
@@ -277,7 +277,6 @@
 AC_CONFIG_FILES([
   qpidc.spec
   Makefile
-  examples/Makefile
   managementgen/Makefile
   etc/Makefile
   src/Makefile
--- qpidc-0.2.667253/Makefile.am.orig	2008-06-12 22:28:56.000000000 -0400
+++ qpidc-0.2.667253/Makefile.am	2008-06-12 22:31:22.000000000 -0400
@@ -9,7 +9,7 @@
   rpm/README.qpidd-devel \
   xml/cluster.xml
 
-SUBDIRS = managementgen etc src docs/api docs/man examples
+SUBDIRS = managementgen etc src docs/api docs/man
 
 # Update libtool, if needed.
 libtool: $(LIBTOOL_DEPS)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 May 2008 16:53:42 -0000	1.5
+++ .cvsignore	18 Jun 2008 17:43:47 -0000	1.6
@@ -1 +1 @@
-qpidc-0.2.656926.tar.gz
+qpidc-0.2.667603.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- qpidc.spec	22 May 2008 16:53:42 -0000	1.31
+++ qpidc.spec	18 Jun 2008 17:43:47 -0000	1.32
@@ -4,7 +4,7 @@
 # svn revision: $Rev: 654927 $
 #
 %define qpidd qpidd
-%define svnrev 656926
+%define svnrev 667603
 
 Name:           qpidc
 Version:        0.2.%{svnrev}
@@ -13,17 +13,16 @@
 Group:          System Environment/Libraries
 License:        Apache Software License
 URL:            http://rhm.et.redhat.com/qpidc
-Source0:        http://rhm.et.redhat.com/download/%{name}-%{version}.tar.gz
+Source0:        %{name}-%{version}.tar.gz
+Patch0:         examples.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExclusiveArch: i386 x86_64
+ExclusiveArch: i386 i686 x86_64
 
 BuildRequires: boost-devel
 BuildRequires: cppunit-devel
 BuildRequires: doxygen
 BuildRequires: e2fsprogs-devel
-BuildRequires: graphviz
-BuildRequires: help2man
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: ruby
@@ -84,6 +83,14 @@
 Libraries and header files for developing extensions to the
 Qpid broker daemon.
 
+%package perftest
+Summary: Simple benchmarking tools
+Group: System Environment/Tools
+Requires: qpidc = %version-%release
+
+%description perftest
+Tools for performing testing and benchmarking of MRG-Messaging
+
 %pre
 getent group qpidd >/dev/null || groupadd -r qpidd
 getent passwd qpidd >/dev/null || \
@@ -93,19 +100,36 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 CXXFLAGS="%{optflags} -DNDEBUG -O3" \
-%configure --disable-static --without-cpg
+%configure --disable-static --without-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
+# remove examples, are being packages separately in the rhm-docs package
+rm -fr examples
+# Make perftest utilities
+pushd src/tests
+make perftest topic_listener topic_publisher latencytest
+popd
 
 %install
 rm -rf %{buildroot}
+mkdir -p -m0755 %{buildroot}/%_bindir
 make install DESTDIR=%{buildroot}
 install -Dp -m0755 etc/qpidd %{buildroot}%{_initrddir}/qpidd
 install -d -m0755 %{buildroot}%{_localstatedir}/lib/qpidd
+install -d -m0755 %{buildroot}%{_libdir}/qpidd
+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
+popd
 rm -f %{buildroot}%_libdir/*.a
 rm -f %{buildroot}%_libdir/*.la
 
@@ -117,7 +141,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE NOTICE README
+%doc LICENSE NOTICE README INSTALL RELEASE_NOTES DESIGN
 %_libdir/libqpidcommon.so.0
 %_libdir/libqpidcommon.so.0.1.0
 %_libdir/libqpidclient.so.0
@@ -136,7 +160,6 @@
 %_libdir/libqpidclient.so
 %_bindir/managementgen
 %_datadir/managementgen
-%doc %_datadir/%{name}/examples
 %doc docs/api/html
 
 %files -n %{qpidd}
@@ -150,6 +173,8 @@
 %config(noreplace) %_sysconfdir/sasl2/qpidd.conf
 %{_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}.*
 
@@ -161,6 +186,12 @@
 %_libdir/libqpidcluster.so
 %_includedir/qpid/broker
 
+%files perftest
+%_bindir/perftest
+%_bindir/topic_listener
+%_bindir/topic_publisher
+%_bindir/latencytest
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -184,6 +215,30 @@
 /sbin/ldconfig
 
 %changelog
+* Thu Jun 13 2008 Justin Ross <jross at redhat.com> - 0.2.667603-1
+- Update to source revision 667603
+
+* Thu Jun 12 2008 Justin Ross <jross at redhat.com> - 0.2.667253-1
+- Update to source revision 667253
+
+* Thu Jun 12 2008 Nuno Santos <nsantos at redhat.com> - 0.2.666138-5
+- add missing doc files
+
+* Wed Jun 11 2008 Justin Ross <jross at redhat.com> - 0.2.666138-3
+- Added directories for modules and pid files to install script
+
+* Wed May 28 2008 David Sommerseth <dsommers at redhat.com> - 0.2.663761-1
+- Added perftest utilities
+
+* Thu May 22 2008 Nuno Santos <nsantos at redhat.com> - 0.2.656926-4
+- Additional build flags for i686
+
+* Tue May 20 2008 Nuno Santos <nsantos at redhat.com> - 0.2.656926-3
+- BZ 432872: remove examples, which are being packaged separately
+
+* Tue May 20 2008 Justin Ross <jross at redhat.com> -0.2.656926-2
+- Drop build requirements for graphviz and help2man
+
 * Wed May 14 2008 Nuno Santos <nsantos at redhat.com> - 0.2-34
 - Bumped for Beta 4 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	22 May 2008 16:53:42 -0000	1.19
+++ sources	18 Jun 2008 17:43:47 -0000	1.20
@@ -1 +1 @@
-a6c4a99ec0ac77f61d4b7ab77d05331d  qpidc-0.2.656926.tar.gz
+b3c5e4f841fb5bdaa8b2186cdbb7cf8d  qpidc-0.2.667603.tar.gz