SHA256
3
0
forked from pool/texinfo

- fix build with automake-1.12

- add: automake-1.12.patch (forwarded request 122759 from puzel)

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texinfo?expand=0&rev=27
This commit is contained in:
Stephan Kulow 2012-05-31 15:10:51 +00:00 committed by Git OBS Bridge
parent c06235231c
commit c69d51de0f
3 changed files with 27 additions and 4 deletions

13
automake-1.12.patch Normal file
View File

@ -0,0 +1,13 @@
Index: texinfo-4.13/configure.ac
===================================================================
--- texinfo-4.13.orig/configure.ac
+++ texinfo-4.13/configure.ac
@@ -13,7 +13,7 @@ AC_INIT([GNU Texinfo], [4.13], [bug-texi
dnl Must come before AM_INIT_AUTOMAKE.
AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([1.10.1 readme-alpha dist-lzma])
+AM_INIT_AUTOMAKE([1.10.1 readme-alpha dist-xz])
# Minimum Autoconf version required.
AC_PREREQ(2.59)

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue May 29 13:37:27 UTC 2012 - puzel@suse.com
- fix build with automake-1.12
- add: automake-1.12.patch
-------------------------------------------------------------------
Wed Feb 8 12:35:24 UTC 2012 - werner@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package texinfo
#
# 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: texinfo
BuildRequires: automake
BuildRequires: help2man
@ -23,13 +24,13 @@ BuildRequires: libzio-devel
BuildRequires: ncurses-devel
BuildRequires: perl-gettext
BuildRequires: zlib-devel
License: GPL-2.0+ ; GPL-3.0+
Group: Productivity/Publishing/Texinfo
Version: 4.13a
Release: 0
%global version_t2h 1.82
%global version_t2r 2.0
Summary: Tools Needed to Create Documentation from Texinfo Sources
License: GPL-2.0+ ; GPL-3.0+
Group: Productivity/Publishing/Texinfo
Url: http://www.texinfo.org
PreReq: %{install_info_prereq}
Provides: makeinfo = %{version}
@ -50,6 +51,7 @@ Patch5: texinfo-4.8-echo.patch
Patch6: texi2roff-2.0-gcc4.patch
Patch7: texinfo-4.13a-bug640417.diff
Patch8: texinfo-4.13a-bug713517.diff
Patch9: automake-1.12.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -81,8 +83,9 @@ Authors:
Roland McGrath <roland@gnu.org>
%package -n info
License: GPL-2.0+
Summary: A Stand-Alone Terminal-Based Info Browser
License: GPL-2.0+
Group: Productivity/Publishing/Texinfo
PreReq: bash zlib libzio
%description -n info
@ -116,6 +119,7 @@ rm -rf texi2html-%{version_t2h} texi2roff-%{version_t2r}
%patch5 -p0 -b .echo
%patch7 -p1 -b .size_t
%patch8 -p0 -b .egrep
%patch9 -p1
%patch -p0
pushd ../texi2html-%{version_t2h}
%patch1 -p0