Hello community,
here is the log from the commit of package man for openSUSE:Factory checked in
at 2012-07-02 11:04:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/man (Old)
and /work/SRC/openSUSE:Factory/.man.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "man", Maintainer is "wer...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/man/man.changes 2012-05-31 17:07:01.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.man.new/man.changes 2012-07-02
11:04:08.000000000 +0200
@@ -1,0 +2,13 @@
+Mon Jul 2 05:08:10 UTC 2012 - co...@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.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ man.spec ++++++
--- /var/tmp/diff_new_pack.SihOcY/_old 2012-07-02 11:04:11.000000000 +0200
+++ /var/tmp/diff_new_pack.SihOcY/_new 2012-07-02 11:04:11.000000000 +0200
@@ -87,7 +87,9 @@
%patch12 -p0 -b .fp
%patch13 -p0 -b .fhs
%patch0 -p0
+%if 0%{?suse_version} > 1210
%patch14 -p1
+%endif
%build
gettextize --force --copy --no-changelog
++++++ automake-1.12.patch ++++++
--- /var/tmp/diff_new_pack.SihOcY/_old 2012-07-02 11:04:11.000000000 +0200
+++ /var/tmp/diff_new_pack.SihOcY/_new 2012-07-02 11:04:11.000000000 +0200
@@ -11,3 +11,76 @@
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], [cjwat...@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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
