Author: kpvdr Date: 2008-04-14 13:05:54 -0400 (Mon, 14 Apr 2008) New Revision: 1908 Modified: store/trunk/cpp/configure.ac store/trunk/cpp/rhm.spec.in store/trunk/cpp/tests/system_test.sh Log: Packaging fixes. Removed cppunit checks and rpm dependencies. Added check for db4-devel (BZ438378). Added a "--auth no" to system tests broker start. Modified: store/trunk/cpp/configure.ac =================================================================== --- store/trunk/cpp/configure.ac 2008-04-14 16:16:58 UTC (rev 1907) +++ store/trunk/cpp/configure.ac 2008-04-14 17:05:54 UTC (rev 1908) @@ -106,7 +106,7 @@ AC_CHECK_LIB([aio], [io_setup], ,[libaio_fail=1]) AC_CHECK_HEADER([libaio.h], ,[libaio_fail=1]) test $libaio_fail == 1 && \ - AC_MSG_ERROR([libaio-devel package missing. Please ensure both libaio and libaio-devel are installed. (hint: yum install libaio-devel should do it...)]) + AC_MSG_ERROR([libaio-devel package missing. Please ensure both libaio and libaio-devel are installed. (hint: "yum install libaio-devel" should do it...)]) # For libraries (libcommon) that use dlopen, dlerror, etc., # test whether we need to link with -ldl. @@ -118,6 +118,11 @@ LIBS=$gl_saved_libs # Require libdb_cxx-4.3, for the library, and for db_cxx.h. +db4_devel_fail=0 +AC_CHECK_HEADER([db_cxx.h], ,[db4_devel_fail=1]) +test $db4_devel_fail == 1 && \ + AC_MSG_ERROR([db4-devel package missing. Please ensure both db4 and db4-devel are installed. (hint: "yum install db4-devel" should do it...)]) + gl_saved_libs=$LIBS AC_SEARCH_LIBS([__db_open], [db_cxx-4.6 db_cxx-4.5 db_cxx-4.4 db_cxx-4.3], [test "$ac_cv_search___db_open" = "none required" || @@ -145,13 +150,6 @@ gl_CLOCK_TIME -# Check for cppunit support. -CPPUNIT_MINIMUM_VERSION=1.10.2 -AM_PATH_CPPUNIT([$CPPUNIT_MINIMUM_VERSION], , [CPPUNIT_LIBS=-lcppunit]) -CPPUNIT_CXXFLAGS=$CPPUNIT_CFLAGS -AC_SUBST(CPPUNIT_LIBS) -AC_SUBST(CPPUNIT_CXXFLAGS) - AC_ARG_ENABLE([apr-platform], [AS_HELP_STRING([--enable-apr-platform], [use the Apache Portable Runtime library for platform (default no)])], Modified: store/trunk/cpp/rhm.spec.in =================================================================== --- store/trunk/cpp/rhm.spec.in 2008-04-14 16:16:58 UTC (rev 1907) +++ store/trunk/cpp/rhm.spec.in 2008-04-14 17:05:54 UTC (rev 1908) @@ -3,7 +3,7 @@ # Name: rhm Version: @VERSION@ -Release: 19%{?dist} +Release: 20%{?dist} Summary: Red Hat extensions to the Qpid messaging system Group: System Environment/Libraries License: LGPL @@ -20,7 +20,6 @@ # when qpid-devel is updated. BuildRequires: e2fsprogs-devel BuildRequires: libaio-devel -BuildRequires: cppunit-devel BuildRequires: python Requires: qpidd @@ -87,6 +86,9 @@ %changelog +* Mon Apr 14 2008 Kim van der Riet <kim.vdriet(a)redhat.com&gt; - 0.2-20 +- removed cppunit as build dependency - all tests now boost test + * Fri Apr 11 2008 Kim van der Riet <kim.vdriet(a)redhat.com&gt; - 0.2-19 - added python package as build dependency Modified: store/trunk/cpp/tests/system_test.sh =================================================================== --- store/trunk/cpp/tests/system_test.sh 2008-04-14 16:16:58 UTC (rev 1907) +++ store/trunk/cpp/tests/system_test.sh 2008-04-14 17:05:54 UTC (rev 1908) @@ -75,7 +75,7 @@ for p in `seq 1 8`; do log="$abs_srcdir/vg-log.$mode.$p" #echo "$vg $QPIDD -m 0 --data dir "" --load-module $LIBBDBSTORE $JRNLFLAGS" - $vg $QPIDD -m 0 --data-dir "" --load-module $LIBBDBSTORE $JRNLFLAGS >> "$abs_srcdir/qpid.log" 2> $log & pid=$! + $vg $QPIDD -m 0 --data-dir "" --load-module $LIBBDBSTORE --auth no $JRNLFLAGS >> "$abs_srcdir/qpid.log" 2> $log & pid=$! sleep 5 echo phase $p...