From fc9a55f33e049177dadcb3b1364988754d11440a4a61ed51833f9cb1c5f59424 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 29 May 2012 13:44:30 +0000 Subject: [PATCH] Accepting request 122740 from home:puzel:branches:Base:System - fix build with automake-1.12 - add: automake-1.12.patch OBS-URL: https://build.opensuse.org/request/show/122740 OBS-URL: https://build.opensuse.org/package/show/Base:System/man?expand=0&rev=26 --- automake-1.12.patch | 13 +++++++++++++ man.changes | 6 ++++++ man.spec | 10 ++++++++-- 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 automake-1.12.patch diff --git a/automake-1.12.patch b/automake-1.12.patch new file mode 100644 index 0000000..8d43110 --- /dev/null +++ b/automake-1.12.patch @@ -0,0 +1,13 @@ +Index: man-db-2.5.2/configure.ac +=================================================================== +--- man-db-2.5.2.orig/configure.ac ++++ man-db-2.5.2/configure.ac +@@ -20,6 +20,8 @@ dnl + AC_PROG_CC + AC_PROG_CPP + AC_GNU_SOURCE ++AM_PROG_AR ++AM_PROG_CC_C_O + dnl + dnl check for system defaults + dnl diff --git a/man.changes b/man.changes index 03e8603..d84513a 100644 --- a/man.changes +++ b/man.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 29 12:39:10 UTC 2012 - puzel@suse.com + +- fix build with automake-1.12 + - add: automake-1.12.patch + ------------------------------------------------------------------- Sun Dec 25 22:22:18 UTC 2011 - coolo@suse.com diff --git a/man.spec b/man.spec index 049ad88..aa5d80d 100644 --- a/man.spec +++ b/man.spec @@ -1,7 +1,7 @@ # # spec file for package man # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: man BuildRequires: automake BuildRequires: flex @@ -34,7 +35,9 @@ Group: System/Base Url: https://savannah.nongnu.org/projects/man-db PreReq: coreutils fillup Provides: man_db -Requires: groff >= 1.18 less glibc-locale +Requires: glibc-locale +Requires: groff >= 1.18 +Requires: less Source: man-db-%{version}.tar.bz2 Source1: sysconfig.cron-man Source2: cron.daily.do_mandb @@ -53,6 +56,7 @@ Patch10: man-db-2.5.1-listall.dif Patch11: man-db-%{version}-catp.dif Patch12: man-db-2.5.2-fastpipe.dif Patch13: man-db-2.5.2-fhs.dif +Patch14: automake-1.12.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc @@ -83,6 +87,7 @@ Authors: %patch12 -p0 -b .fp %patch13 -p0 -b .fhs %patch0 -p0 +%patch14 -p1 %build gettextize --force --copy --no-changelog @@ -115,6 +120,7 @@ Authors: %if %suse_version > 1030 aclocal -I ${PWD}/m4 -I ${PWD}/gnulib/m4 autoconf -B ${PWD}/m4 -B ${PWD}/gnulib/m4 + automake --add-missing %else sed -ri 's/(m4_PACKAGE_VERSION,[[:blank:]]*\[)2.61(\])/\12.60\2/' aclocal.m4 sed -ri 's/(AM_INIT_AUTOMAKE\(\[)1.10/\11.9.6/' configure.ac