Accepting request 126845 from Base:System

- merge the automake 1.12 patches

- fix build for openSUSE.
  * AM_PROG_AR 
- fix 12.2 builds
  * replace depreciated am_prog_mkdir_p with ac_prog_mkdir_p.

OBS-URL: https://build.opensuse.org/request/show/126845
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/man?expand=0&rev=48

automake-1.12.patch

@@ -11,3 +11,76 @@ Index: man-db-2.5.2/configure.ac
  dnl 
  dnl check for system defaults
  dnl
+diff -urN man-db-2.5.2.orig/aclocal.m4 man-db-2.5.2/aclocal.m4
+--- man-db-2.5.2.orig/aclocal.m4	2012-07-02 05:51:00.699476202 +0800
++++ man-db-2.5.2/aclocal.m4	2012-07-02 05:51:15.795287476 +0800
+@@ -449,7 +449,7 @@
+ AM_MISSING_PROG(MAKEINFO, makeinfo)
+ AM_PROG_INSTALL_SH
+ AM_PROG_INSTALL_STRIP
+-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
++AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+ AC_REQUIRE([AC_PROG_AWK])dnl
+@@ -625,10 +625,10 @@
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# AM_PROG_MKDIR_P
++# AC_PROG_MKDIR_P
+ # ---------------
+ # Check for `mkdir -p'.
+-AC_DEFUN([AM_PROG_MKDIR_P],
++AC_DEFUN([AC_PROG_MKDIR_P],
+ [AC_PREREQ([2.60])dnl
+ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+ dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+diff -urN man-db-2.5.2.orig/configure.ac man-db-2.5.2/configure.ac
+--- man-db-2.5.2.orig/configure.ac	2012-07-02 05:51:00.679476451 +0800
++++ man-db-2.5.2/configure.ac	2012-07-02 06:39:30.342100663 +0800
+@@ -4,7 +4,7 @@
+ # Initialise and check we're in the correct directory.
+ AC_INIT([man-db], [2.5.2], [cjwatson@debian.org])
+ AC_CONFIG_AUX_DIR(tools)
+-AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign])
++AM_INIT_AUTOMAKE([1.10 -Wall foreign])
+ AC_PREREQ([2.59])
+ AC_CONFIG_SRCDIR(src/man.c)
+ 
+diff -urN man-db-2.5.2.orig/gnulib/m4/gnulib-common.m4 man-db-2.5.2/gnulib/m4/gnulib-common.m4
+--- man-db-2.5.2.orig/gnulib/m4/gnulib-common.m4	2012-07-02 05:51:00.657476726 +0800
++++ man-db-2.5.2/gnulib/m4/gnulib-common.m4	2012-07-02 05:51:15.795287476 +0800
+@@ -36,7 +36,7 @@
+ # Remove this macro when we can assume autoconf >= 2.60.
+ m4_ifdef([AC_PROG_MKDIR_P], [], [
+   AC_DEFUN([AC_PROG_MKDIR_P],
+-    [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
++    [AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
+      MKDIR_P='$(mkdir_p)'
+      AC_SUBST([MKDIR_P])])])
+ 
+diff -urN man-db-2.5.2.orig/m4/intl.m4 man-db-2.5.2/m4/intl.m4
+--- man-db-2.5.2.orig/m4/intl.m4	2012-07-02 05:51:00.681476426 +0800
++++ man-db-2.5.2/m4/intl.m4	2012-07-02 05:51:15.796287464 +0800
+@@ -25,7 +25,7 @@
+ AC_DEFUN([AM_INTL_SUBDIR],
+ [
+   AC_REQUIRE([AC_PROG_INSTALL])dnl
+-  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
++  AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
+   AC_REQUIRE([AC_PROG_CC])dnl
+   AC_REQUIRE([AC_CANONICAL_HOST])dnl
+   AC_REQUIRE([gt_GLIBC2])dnl
+diff -urN man-db-2.5.2.orig/m4/po.m4 man-db-2.5.2/m4/po.m4
+--- man-db-2.5.2.orig/m4/po.m4	2012-07-02 05:51:00.681476426 +0800
++++ man-db-2.5.2/m4/po.m4	2012-07-02 05:51:15.796287464 +0800
+@@ -24,7 +24,7 @@
+ [
+   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+   AC_REQUIRE([AC_PROG_INSTALL])dnl
+-  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
++  AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
+   AC_REQUIRE([AM_NLS])dnl
+ 
+   dnl Release version of the gettext macros. This is used to ensure that

man.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Jul  2 05:08:10 UTC 2012 - coolo@suse.com
+
+- merge the automake 1.12 patches
+
+-------------------------------------------------------------------
+Thu Jun 28 09:48:13 UTC 2012 - i@marguerite.su
+
+- fix build for openSUSE.
+  * AM_PROG_AR 
+- fix 12.2 builds
+  * replace depreciated am_prog_mkdir_p with ac_prog_mkdir_p.
+
 -------------------------------------------------------------------
 Tue May 29 12:39:10 UTC 2012 - puzel@suse.com
 

man.spec

@@ -87,7 +87,9 @@ Authors:
 %patch12 -p0 -b .fp
 %patch13 -p0 -b .fhs
 %patch0   -p0
+%if 0%{?suse_version} > 1210
 %patch14 -p1
+%endif
 
 %build
     gettextize --force --copy --no-changelog