RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm                              Date:   28-Jun-2007 08:05:29
  Branch: HEAD                             Handle: 2007062807052900

  Modified files:
    rpm                     CHANGES configure.ac

  Log:
    Introduce an Autoconf option --with-bugreport=<email-address> and
    require this before unsupported Autoconf operations can be used (like
    --with-db=external). The PACKAGE_BUGREPORT #define should be still
    output on "rpm --help", but I currently don't know how to achieve this
    with POPT, so defer this until I know more.

  Summary:
    Revision    Changes     Path
    1.1411      +1  -0      rpm/CHANGES
    2.151       +14 -2      rpm/configure.ac
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1410 -r1.1411 CHANGES
  --- rpm/CHANGES	27 Jun 2007 22:44:55 -0000	1.1410
  +++ rpm/CHANGES	28 Jun 2007 06:05:29 -0000	1.1411
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - rse: introduce --with-bugreport=<email-address> and require this before unsupported Autoconf operations
       - rse: simplify internal Berkeley-DB handling in rpmdb/ and allow (unsupported) --with-db=external
       - pmatilaj: remove hardcoded "libtermcap" vs. Bash kludge in lib/psm.c
       - rse: implement --without-file, i.e., building RPM without File/magic support
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.150 -r2.151 configure.ac
  --- rpm/configure.ac	27 Jun 2007 22:44:55 -0000	2.150
  +++ rpm/configure.ac	28 Jun 2007 06:05:29 -0000	2.151
  @@ -7,13 +7,23 @@
   dnl ##
   
   AC_PREREQ(2.57)
  -AC_INIT(rpm, 5.0, [rpm-devel@rpm5.org])
  +AC_DEFUN([PACKAGE_BUGREPORT_DEFAULT], [rpm-devel@rpm5.org])
  +AC_INIT(rpm, 5.0, [PACKAGE_BUGREPORT_DEFAULT])
   AC_CONFIG_SRCDIR([rpmqv.c])
   AC_CONFIG_HEADERS([config.h])
   AC_CANONICAL_TARGET
   AM_INIT_AUTOMAKE([foreign])
   AM_MAINTAINER_MODE
   
  +dnl # allow packagers to override the bugreport address
  +AC_ARG_WITH(bugreport,
  +    AS_HELP_STRING([--with-bugreport=ADDRESS], [set packager bugreport Email address (PACKAGE_BUGREPORT_DEFAULT)]), [dnl
  +    case "$withval" in
  +        *@* ) PACKAGE_BUGREPORT="$withval" ;;
  +        *   ) AC_ERROR([invalid bugreport Email address]) ;;
  +    esac
  +])
  +
   dnl # Library code modified:                              REVISION++
   dnl # Interfaces changed/added/removed:   CURRENT++       REVISION=0
   dnl # Interfaces added:                             AGE++
  @@ -737,8 +747,10 @@
         AM_CONDITIONAL(WITH_DB_INTERNAL, [ test ".$RPM_CHECK_LIB_LOCATION" = .internal ])
         if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
             AC_DEFINE(HAVE_DB_H, 1, [Have <db.h> header])
  +      elif test ".$PACKAGE_BUGREPORT" != ".]m4_defn([PACKAGE_BUGREPORT_DEFAULT])["; then
  +          AC_MSG_WARN([using external Berkeley-DB not recommended -- proceeding on packagers responsibility])
         else
  -          AC_MSG_WARN([using external Berkeley-DB not recommended and at least not officially supported by rpm5.org])
  +          AC_MSG_ERROR([using external Berkeley-DB not supported (without packager taking responsibility first)])
         fi
       ],
       [ AC_ERROR([mandatory Berkeley-DB library not found]) ])
  @@ .