- ac25x patch: allow build using autoconf 2.53

Changed files:
    rpm-ac25x.patch -> 1.2
    rpm.spec -> 1.304

diff --git a/rpm-ac25x.patch b/rpm-ac25x.patch
index ad0bafc9c51db7ff1f5e2dbbf6f51c147245db30..362d2d893abae36922b5ff8b7e190a584323c3e8 100644 (file)
--- a/rpm-ac25x.patch
+++ b/rpm-ac25x.patch
@@ -1,5 +1,5 @@
---- rpm-4.0.4/configure.in.orig        Sat Mar 16 20:30:55 2002
-+++ rpm-4.0.4/configure.in     Sat Mar 16 20:32:13 2002
+--- rpm-4.0.2/configure.in.orig        Sat Mar 16 20:30:55 2002
++++ rpm-4.0.2/configure.in     Sat Mar 16 20:32:13 2002
 @@ -17,8 +17,6 @@
  dnl Set of available languages.
  ALL_LINGUAS="cs da de en_RN es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"
@@ -32,16 +32,17 @@
  AC_FUNC_FNMATCH
  if test $ac_cv_func_fnmatch_works = no; then
 -   LIBOBJS="$LIBOBJS fnmatch.o"
+-   AC_DEFINE_UNQUOTED(fnmatch, rpl_fnmatch)
 +   AC_LIBOBJ([fnmatch])
- dnl XXX no expansion needed
- dnl AC_DEFINE_UNQUOTED(fnmatch, rpl_fnmatch)
++dnl   AC_DEFINE_UNQUOTED(fnmatch, rpl_fnmatch)
  fi
+ 
 @@ -771,7 +769,7 @@
  dnl 
  dnl if test $rpm_cv_regex = yes; then
  dnl     AC_DEFINE(USE_GNU_REGEX)
 -dnl     LIBOBJS="$LIBOBJS regex.o"
-+dnl     AC_LIBOBJ([regex.o])
++dnl     AC_LIBOBJ([regex])
  dnl fi
  
  dnl
@@ -50,8 +51,8 @@
  if test "$rpm_cv_glob" = yes; then
      AC_DEFINE(USE_GNU_GLOB)
 -    LIBOBJS="$LIBOBJS glob.o fnmatch.o"
-+    AC_LIBOBJ([glob.o])
-+    AC_LIBOBJ([fnmatch.o])
++    AC_LIBOBJ([glob])
++    AC_LIBOBJ([fnmatch])
  fi
  dnl
  dnl Auto-detect which python bindings should be built.
@@ -94,3 +95,23 @@
      INCPATH="-I\$(top_builddir)/misc $INCPATH"
  fi
  AC_SUBST(INCPATH)
+--- rpm-4.0.2/acconfig.h.orig  Wed Mar 27 20:25:58 2002
++++ rpm-4.0.2/acconfig.h       Wed Mar 27 20:33:00 2002
+@@ -12,7 +12,7 @@
+    a given entry is in the file.
+ 
+    Leave the following blank line there!!  Autoheader needs it.  */
+-^L
++\f
+ 
+ /* Define to the name of the distribution.  */
+ #undef PACKAGE
+@@ -162,7 +162,7 @@
+ /* Build with dmalloc support? */
+ #undef DMALLOC
+ 
+-^L
++\f
+ /* Leave that blank line there!!  Autoheader needs it.
+    If you're adding to this file, keep in mind:
+    The entries are in sort -df order: alphabetical, case insensitive,

diff --git a/rpm.spec b/rpm.spec
index 99d4e46980d756b0f2f3d82f918bfdfb741059ea..02f0eebd6c37ddb330a8daabb5888b36fa2c6cb7 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -59,6 +59,7 @@ Patch31:      %{name}-athlon-identify.patch
 Patch32:       %{name}-gettext-in-header.patch
 Patch33:       %{name}-perlprov-perl5.6.patch
 Patch34:       %{name}-groups-po.patch
+Patch35:       %{name}-ac25x.patch
 Patch37:        %{name}-short_circuit.patch
 Patch38:        %{name}-section_test.patch
 URL:           http://www.rpm.org/
@@ -355,6 +356,7 @@ construir pacotes usando o RPM.
 
 %patch32 -p1
 %patch35 -p1
+%patch35 -p1
 %patch36 -p1
 %patch37 -p1
 %patch38 -p1