RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Anders F. Björklund
  Root:   /v/rpm/cvs                       Email:  afb@rpm5.org
  Module: rpm                              Date:   01-Sep-2010 10:26:37
  Branch: HEAD                             Handle: 2010090108263601

  Modified files:
    rpm                     CHANGES configure.ac
    rpm/tests               macros.in

  Log:
    tests: set up local magic path for internal file.

  Summary:
    Revision    Changes     Path
    1.3436      +1  -0      rpm/CHANGES
    2.449       +5  -2      rpm/configure.ac
    1.30        +1  -2      rpm/tests/macros.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3435 -r1.3436 CHANGES
  --- rpm/CHANGES	31 Aug 2010 16:34:00 -0000	1.3435
  +++ rpm/CHANGES	1 Sep 2010 08:26:36 -0000	1.3436
  @@ -1,4 +1,5 @@
   5.3.3 -> 5.4a1:
  +    - afb: tests: set up local magic path for internal file.
       - jbj: rpmrepo: move CLI tables and global __rpmrepo structure.
       - afb: tests: target POSIX make instead of GNU make.
       - jbj: rpmrepo: move the data structures into the rpmrepo object.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.448 -r2.449 configure.ac
  --- rpm/configure.ac	30 Aug 2010 08:28:36 -0000	2.448
  +++ rpm/configure.ac	1 Sep 2010 08:26:36 -0000	2.449
  @@ -1356,11 +1356,14 @@
       [File (magic)], [file],
       [magic], [magic_open], [magic.h],
       [yes,external:internal:none], [file:src:src],
  -    [ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
  +    [ AM_CONDITIONAL(WITH_FILE_INTERNAL, [ test ".$RPM_CHECK_LIB_LOCATION" = .internal ])
  +      if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
             WITH_FILE_INTERNAL=true
             AC_DEFINE(HAVE_MAGIC_H, 1, [Define to 1 if you have <magic.h>])
         fi
  -    ], [])
  +    ],
  +    [ AM_CONDITIONAL(WITH_FILE_INTERNAL, [ false ])
  +    ])
   
   dnl # Berkeley-DB & SQLite
   DBLIBSRCS=""
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tests/macros.in
  ============================================================================
  $ cvs diff -u -r1.29 -r1.30 macros.in
  --- rpm/tests/macros.in	28 Aug 2010 18:53:48 -0000	1.29
  +++ rpm/tests/macros.in	1 Sep 2010 08:26:37 -0000	1.30
  @@ -45,8 +45,7 @@
   #%_solve_name_fmt	%{?_solve_pkgsdir}%{___NVRA}.rpm
   
   %find_lang		%{_testdir}/../scripts/find-lang.sh %{buildroot}
  -# XXX uncomment for --with-file=internal
  -#%_rpmfc_magic_path	%{_testdir}/../file/magic/magic
  +@WITH_FILE_INTERNAL_TRUE@%_rpmfc_magic_path	%{_testdir}/../file/magic/magic
   %__libtool_provides     %{nil}
   %__libtool_requires     %{nil}
   %__scriptlet_requires	%{nil}
  @@ .