QPID-1035: managementgen only exists in qpid C++ source - applying patched supplied by Matt Farrellee

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@654564 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 15 insertions, 6 deletions

diff --git a/qpid/cpp/Makefile.am b/qpid/cpp/Makefile.am
index 42fc47ba5f..7a7c45aeb0 100644
--- a/qpid/cpp/Makefile.am
+++ b/qpid/cpp/Makefile.am
@@ -12,7 +12,7 @@ EXTRA_DIST = \
 
 sysconf_DATA = etc/qpidd.conf
 
-SUBDIRS = src docs/api docs/man examples 
+SUBDIRS = managementgen src docs/api docs/man examples
 
 # Update libtool, if needed.
 libtool: $(LIBTOOL_DEPS)
diff --git a/qpid/cpp/configure.ac b/qpid/cpp/configure.ac
index 50fbb5be94..751ca7ce80 100644
--- a/qpid/cpp/configure.ac
+++ b/qpid/cpp/configure.ac
@@ -260,6 +260,7 @@ AC_CONFIG_FILES([
   qpidc.spec
   Makefile
   examples/Makefile
+  managementgen/Makefile
   src/Makefile
   src/tests/Makefile
   docs/man/Makefile
diff --git a/qpid/cpp/managementgen/generate.py b/qpid/cpp/managementgen/generate.py
index e1c01de9b0..5e3aa51b57 100755
--- a/qpid/cpp/managementgen/generate.py
+++ b/qpid/cpp/managementgen/generate.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/qpid/cpp/managementgen/schema.py b/qpid/cpp/managementgen/schema.py
index 7e4a91814f..1b4ca75b44 100755
--- a/qpid/cpp/managementgen/schema.py
+++ b/qpid/cpp/managementgen/schema.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/qpid/cpp/qpidc.spec.in b/qpid/cpp/qpidc.spec.in
index eb62b30d01..3510a64a9f 100644
--- a/qpid/cpp/qpidc.spec.in
+++ b/qpid/cpp/qpidc.spec.in
@@ -7,7 +7,7 @@
 
 Name:           @PACKAGE@
 Version:        @VERSION@
-Release:        28%{?dist}
+Release:        31%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        Apache Software License
@@ -45,6 +45,7 @@ Group: Development/System
 Requires: %name = %version-%release
 Requires: boost-devel
 Requires: e2fsprogs-devel
+Requires: python
 
 %description devel
 Libraries, header files and documentation for developing AMQP clients
@@ -124,6 +125,8 @@ make check
 %_includedir/qpid/management
 %_libdir/libqpidcommon.so
 %_libdir/libqpidclient.so
+%_bindir/managementgen
+%_datadir/managementgen
 %doc %_datadir/%{name}/examples
 %doc docs/api/html
 
@@ -169,6 +172,15 @@ fi
 /sbin/ldconfig
 
 %changelog
+* Wed May  7 2008 Matthew Farrellee <mfarrellee@redhat> - 0.2-31
+- Added python dependency, needed by managementgen
+
+* Wed May  7 2008 Matthew Farrellee <mfarrellee@redhat> - 0.2-30
+- Added management-types.xml to qpidc-devel package
+
+* Tue May  6 2008 Matthew Farrellee <mfarrellee@redhat> - 0.2-29
+- Added managementgen to the qpidc-devel package
+
 * Mon Apr 14 2008 Nuno Santos <nsantos@redhat.com> - 0.2-28
  - Fix home dir permissions
  - Bumped for Fedora 9