Fix the build with texinfo 6.0
This commit is contained in:
parent
7c217e42a6
commit
01ed812d96
27
0001-Update-configure.ac-to-reconize-texi2any.patch
Normal file
27
0001-Update-configure.ac-to-reconize-texi2any.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
From e2fa19ed1a1463cbea37bbdd27481aeb80d5d7a0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Martin Michlmayr <tbm@cyrius.com>
|
||||||
|
Date: Tue, 30 Jun 2015 12:40:49 -0400
|
||||||
|
Subject: [PATCH] Update configure.ac to reconize texi2any
|
||||||
|
|
||||||
|
makeinfo, which is nowadays provided by texi2any, reports texi2any as
|
||||||
|
of version 6.0.
|
||||||
|
---
|
||||||
|
configure.ac | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 10a5efe..13041bd 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -89,7 +89,7 @@ if test x"${MAKEINFO_FOUND}" = xyes
|
||||||
|
then
|
||||||
|
MAKEINFO_VERSION_REQ=5
|
||||||
|
AC_MSG_CHECKING([for makeinfo version >= $MAKEINFO_VERSION_REQ])
|
||||||
|
- MAKEINFO_VERSION=`makeinfo --version | sed -ne 's/^makeinfo .* \([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*$/\1/p'`
|
||||||
|
+ MAKEINFO_VERSION=`makeinfo --version | sed -ne 's/^\(makeinfo\|texi2any\) .* \([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*$/\2/p'`
|
||||||
|
if test x$MAKEINFO_VERSION = x -o 0$MAKEINFO_VERSION -lt $MAKEINFO_VERSION_REQ
|
||||||
|
then
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
--
|
||||||
|
2.5.0
|
||||||
|
|
@ -13,6 +13,8 @@ Group: System Environment/Libraries
|
|||||||
License: LGPLv3+
|
License: LGPLv3+
|
||||||
URL: http://www.abilitiessoft.com/
|
URL: http://www.abilitiessoft.com/
|
||||||
Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
||||||
|
# Backported upstream patch to fix the build with texinfo 6.0
|
||||||
|
Patch0: 0001-Update-configure.ac-to-reconize-texi2any.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
@ -21,6 +23,9 @@ BuildRequires: texinfo
|
|||||||
BuildRequires: texinfo-tex
|
BuildRequires: texinfo-tex
|
||||||
BuildRequires: python2-devel
|
BuildRequires: python2-devel
|
||||||
|
|
||||||
|
# For patch0
|
||||||
|
BuildRequires: autoconf automake libtool
|
||||||
|
|
||||||
%if !( 0%{?rhel} > 0 && 0%{?rhel} <= 7)
|
%if !( 0%{?rhel} > 0 && 0%{?rhel} <= 7)
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
%endif
|
%endif
|
||||||
@ -108,7 +113,10 @@ This package provides the documentation for liblouis.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
|
# For patch0
|
||||||
|
autoreconf -fi
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --disable-static --enable-ucs4
|
%configure --disable-static --enable-ucs4
|
||||||
@ -202,6 +210,7 @@ fi
|
|||||||
%changelog
|
%changelog
|
||||||
* Sun Aug 23 2015 Kalev Lember <klember@redhat.com> - 2.6.2-3
|
* Sun Aug 23 2015 Kalev Lember <klember@redhat.com> - 2.6.2-3
|
||||||
- Rename liblouis-python3 to python3-louis, as per latest packaging guidelines
|
- Rename liblouis-python3 to python3-louis, as per latest packaging guidelines
|
||||||
|
- Fix the build with texinfo 6.0
|
||||||
|
|
||||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.2-2
|
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.2-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
Loading…
Reference in New Issue
Block a user