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

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   06-Jun-2007 23:46:24
  Branch: rpm-4_5                          Handle: 2007060622462301

  Modified files:           (Branch: rpm-4_5)
    rpm                     CHANGES
    rpm/popt                Makefile.am configure.ac testit.sh

  Log:
    - popt: allow tests to pass in distcheck where builddir != srcdir.

  Summary:
    Revision    Changes     Path
    1.1360.2.8  +1  -0      rpm/CHANGES
    1.36.2.2    +1  -1      rpm/popt/Makefile.am
    1.10.2.6    +1  -1      rpm/popt/configure.ac
    1.20.2.1    +1  -1      rpm/popt/testit.sh
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1360.2.7 -r1.1360.2.8 CHANGES
  --- rpm/CHANGES	6 Jun 2007 06:23:49 -0000	1.1360.2.7
  +++ rpm/CHANGES	6 Jun 2007 21:46:23 -0000	1.1360.2.8
  @@ -11,6 +11,7 @@
   	- python: pathetic band-aid pythonic return fixing (#239586).
   	- python: permit hdr.name as well as hdr['name'].
   	- python: restore rpm.RPMSENSE_PREREQ for rpmlint.
  +	- popt: allow tests to pass in distcheck where builddir != srcdir.
   	
   4.4.8 -> 4.4.9:
   	- start rpm-4.4.9 devel.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/popt/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.36.2.1 -r1.36.2.2 Makefile.am
  --- rpm/popt/Makefile.am	25 May 2007 19:00:38 -0000	1.36.2.1
  +++ rpm/popt/Makefile.am	6 Jun 2007 21:46:24 -0000	1.36.2.2
  @@ -4,7 +4,7 @@
   
   LINT = splint
   
  -EXTRA_DIST = config.rpath m4/ChangeLog  autogen.sh CHANGES $(man_MANS) popt.spec libpopt.vers \
  +EXTRA_DIST = config.rpath m4/ChangeLog  config.rpath m4/ChangeLog  autogen.sh CHANGES $(man_MANS) popt.spec libpopt.vers \
   	testit.sh test-poptrc test3-data/0* \
   	po/*.in po/*.po po/popt.pot \
   	popt.ps
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/popt/configure.ac
  ============================================================================
  $ cvs diff -u -r1.10.2.5 -r1.10.2.6 configure.ac
  --- rpm/popt/configure.ac	5 Jun 2007 21:08:30 -0000	1.10.2.5
  +++ rpm/popt/configure.ac	6 Jun 2007 21:46:24 -0000	1.10.2.6
  @@ -110,4 +110,4 @@
   	[Full path to popt top_srcdir.])
   AC_SUBST(POPT_SOURCE_PATH)
   
  -AC_OUTPUT([Doxyfile Makefile])
  +AC_OUTPUT([Doxyfile Makefile po/Makefile.in])
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/popt/testit.sh
  ============================================================================
  $ cvs diff -u -r1.20 -r1.20.2.1 testit.sh
  --- rpm/popt/testit.sh	25 May 2007 17:36:23 -0000	1.20
  +++ rpm/popt/testit.sh	6 Jun 2007 21:46:24 -0000	1.20.2.1
  @@ -39,7 +39,7 @@
   }
   
   builddir=`pwd`
  -srcdir=$builddir
  +[ -z "$srcdir" ] && srcdir=$builddir
   cd ${srcdir}
   test1=${builddir}/test1
   echo "Running tests in `pwd`"
  @@ .