[rhmessaging-commits] rhmessaging commits: r4455 - in store/trunk/cpp: tools and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: tedross
Date: 2011-05-03 14:49:45 -0400 (Tue, 03 May 2011)
New Revision: 4455

Added:
   store/trunk/cpp/tools/__init__.py
Modified:
   store/trunk/cpp/configure.ac
   store/trunk/cpp/tools/Makefile.am
   store/trunk/cpp/tools/resize
   store/trunk/cpp/tools/store_chk
Log:
Fix for BZ-689907 - Fix rpmdiff issues
This change moves the installed python artifacts in an arch-specific directory to
prevent multi-lib issues.


Modified: store/trunk/cpp/configure.ac
===================================================================
--- store/trunk/cpp/configure.ac	2011-05-02 15:39:19 UTC (rev 4454)
+++ store/trunk/cpp/configure.ac	2011-05-03 18:49:45 UTC (rev 4455)
@@ -215,6 +215,9 @@
 AM_CONDITIONAL([DOXYGEN], [test x$do_doxygen = xyes])
 AM_CONDITIONAL([DO_CLUSTER_TESTS], [test $enable_CLUSTER_TESTS = yes])
 
+# Check for Python libraries for the Journal Tools
+AM_PATH_PYTHON()
+
 AC_CONFIG_FILES([
   Makefile
   docs/Makefile

Modified: store/trunk/cpp/tools/Makefile.am
===================================================================
--- store/trunk/cpp/tools/Makefile.am	2011-05-02 15:39:19 UTC (rev 4454)
+++ store/trunk/cpp/tools/Makefile.am	2011-05-03 18:49:45 UTC (rev 4455)
@@ -20,12 +20,7 @@
 # The GNU Lesser General Public License is available in the file COPYING.
 
 qpidexecdir = $(libexecdir)/qpid
-qpidexec_SCRIPTS = jerr.py jrnl.py janal.py resize store_chk
+qpidexec_SCRIPTS = resize store_chk
 
-EXTRA_DIST = \
-    jerr.py \
-    jrnl.py \
-    janal.py \
-    resize \
-    store_chk
-	
\ No newline at end of file
+pkgpyexec_qpiddir = $(pyexecdir)/qpidstore
+pkgpyexec_qpid_PYTHON = __init__.py jerr.py jrnl.py janal.py

Added: store/trunk/cpp/tools/__init__.py
===================================================================
--- store/trunk/cpp/tools/__init__.py	                        (rev 0)
+++ store/trunk/cpp/tools/__init__.py	2011-05-03 18:49:45 UTC (rev 4455)
@@ -0,0 +1,23 @@
+"""
+Copyright (c) 2007, 2008 Red Hat, Inc.
+
+This file is part of the Qpid async store library msgstore.so.
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+USA
+
+The GNU Lesser General Public License is available in the file COPYING.
+"""
+

Modified: store/trunk/cpp/tools/resize
===================================================================
--- store/trunk/cpp/tools/resize	2011-05-02 15:39:19 UTC (rev 4454)
+++ store/trunk/cpp/tools/resize	2011-05-03 18:49:45 UTC (rev 4455)
@@ -22,7 +22,7 @@
 The GNU Lesser General Public License is available in the file COPYING.
 """
 
-import jerr, jrnl, janal
+from qpidstore import jerr, jrnl, janal
 import glob, optparse, os, sys, time
 
 

Modified: store/trunk/cpp/tools/store_chk
===================================================================
--- store/trunk/cpp/tools/store_chk	2011-05-02 15:39:19 UTC (rev 4454)
+++ store/trunk/cpp/tools/store_chk	2011-05-03 18:49:45 UTC (rev 4455)
@@ -22,7 +22,7 @@
 The GNU Lesser General Public License is available in the file COPYING.
 """
 
-import jerr, jrnl, janal
+from qpidstore import jerr, jrnl, janal
 import optparse, os, sys