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:   21-Jun-2007 20:58:05
  Branch: HEAD                             Handle: 2007062119580500

  Modified files:
    rpm                     CHANGES configure.ac
    rpm/build               parsePrep.c

  Log:
    - remove support for patch-2.1.

  Summary:
    Revision    Changes     Path
    1.1389      +1  -0      rpm/CHANGES
    2.75        +2  -6      rpm/build/parsePrep.c
    2.106       +0  -11     rpm/configure.ac
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1388 -r1.1389 CHANGES
  --- rpm/CHANGES	21 Jun 2007 18:08:37 -0000	1.1388
  +++ rpm/CHANGES	21 Jun 2007 18:58:05 -0000	1.1389
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - jbj: remove support for patch-2.1.
       - rse: allow actually used tar(1) and patch(1) tools to be set via %__tar and %__patch
       - rse: add support for patch(1)'s "-d" option to internal macro %patch
       - fray: allow -bb --short-circuit
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/parsePrep.c
  ============================================================================
  $ cvs diff -u -r2.74 -r2.75 parsePrep.c
  --- rpm/build/parsePrep.c	21 Jun 2007 18:08:38 -0000	2.74
  +++ rpm/build/parsePrep.c	21 Jun 2007 18:58:05 -0000	2.75
  @@ -81,12 +81,8 @@
       const char *patch;
   
       *t = '\0';
  -    if (db) {
  -#if HAVE_OLDPATCH_21 == 0
  -	t = stpcpy(t, "-b ");
  -#endif
  -	t = stpcpy( stpcpy(t, "--suffix "), db);
  -    }
  +    if (db)
  +	t = stpcpy( stpcpy(t, "-b --suffix "), db);
       if (subdir)
   	t = stpcpy( stpcpy(t, "-d "), subdir);
       if (fuzz) {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.105 -r2.106 configure.ac
  --- rpm/configure.ac	21 Jun 2007 12:13:28 -0000	2.105
  +++ rpm/configure.ac	21 Jun 2007 18:58:05 -0000	2.106
  @@ -284,17 +284,6 @@
   AC_PATH_PROG(__MKDIR, mkdir, /bin/mkdir, $MYPATH)
   AC_PATH_PROG(__MV, mv, /bin/mv, $MYPATH)
   AC_PATH_PROG(__PATCH, patch, %{_bindir}/patch, $MYPATH)
  -AC_MSG_CHECKING(old version of patch)
  -    PATCHVERSION=`patch --version 2>&1`
  -
  -    if test "$PATCHVERSION" = "Patch version 2.1"; then
  -	AC_DEFINE(HAVE_OLDPATCH_21, 1,
  -		[Define if the patch call you'll be using is 2.1 or older])
  -	AC_MSG_RESULT(patch older then 2.2 found)
  -    else
  -	AC_MSG_RESULT(patch later then 2.2 found)
  -    fi
  -
   AC_PATH_PROG(__PAX, pax, %{_bindir}/pax, $MYPATH)
   AC_PATH_PROG(__PERL, perl, %{_bindir}/perl, $MYPATH)
   AC_PATH_PROG(__PGP, pgp, %{_bindir}/pgp, $MYPATH)
  @@ .