Fix building on x86_64 (FTBFS bug #564601).
This commit is contained in:
parent
80e7bef3c1
commit
8e60424066
16
recode-flex-m4.patch
Normal file
16
recode-flex-m4.patch
Normal file
@ -0,0 +1,16 @@
|
||||
--- recode-3.6-orig/m4/flex.m4 2000-06-28 16:39:06.000000000 +0200
|
||||
+++ recode-3.6/m4/flex.m4 2010-07-07 12:23:49.000000000 +0200
|
||||
@@ -8,11 +8,8 @@
|
||||
dnl Look for flex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
|
||||
AC_DEFUN(ad_AC_PROG_FLEX,
|
||||
[AC_CHECK_PROGS(LEX, flex, missing)
|
||||
-if test "$LEX" = missing; then
|
||||
+AS_IF([test "$LEX" = missing], [
|
||||
LEX="\$(top_srcdir)/$ac_aux_dir/missing flex"
|
||||
LEX_OUTPUT_ROOT=lex.yy
|
||||
AC_SUBST(LEX_OUTPUT_ROOT)dnl
|
||||
-else
|
||||
- AC_PROG_LEX
|
||||
- AC_DECL_YYTEXT
|
||||
-fi])
|
||||
+])])
|
17
recode.spec
17
recode.spec
@ -1,13 +1,14 @@
|
||||
Summary: Conversion between character sets and surfaces
|
||||
Name: recode
|
||||
Version: 3.6
|
||||
Release: 28%{?dist}
|
||||
Release: 29%{?dist}
|
||||
License: GPLv2+
|
||||
Group: Applications/File
|
||||
Source: http://recode.progiciels-bpi.ca/archives/recode-%{version}.tar.gz
|
||||
Patch0: recode.patch
|
||||
Patch1: recode-3.6-getcwd.patch
|
||||
Patch2: recode-bool-bitfield.patch
|
||||
Patch3: recode-flex-m4.patch
|
||||
Url: http://recode.progiciels-bpi.ca/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
@ -16,6 +17,8 @@ Requires(post): /sbin/ldconfig
|
||||
Requires(preun): /sbin/install-info
|
||||
Requires(postun): /sbin/ldconfig
|
||||
|
||||
BuildRequires: libtool
|
||||
|
||||
|
||||
%description
|
||||
The `recode' converts files between character sets and usages.
|
||||
@ -43,11 +46,18 @@ are supported.
|
||||
%patch0 -p1
|
||||
%patch1 -p1 -b .getcwd
|
||||
%patch2 -p0
|
||||
%patch3 -p1
|
||||
rm m4/libtool.m4
|
||||
rm acinclude.m4
|
||||
|
||||
%build
|
||||
autoreconf -fiv
|
||||
%configure --disable-static
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%check
|
||||
make check
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
@ -89,6 +99,11 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_includedir}/*
|
||||
|
||||
%changelog
|
||||
* Wed Jul 7 2010 Zoltan Kota <z.kota[AT]gmx.net> 3.6-29
|
||||
- Fix build on x86_64. Run autoreconf to update config files.
|
||||
autoconf >= 2.64 needs to patch the flex.m4 file.
|
||||
Fixing FTBFS bug #564601.
|
||||
|
||||
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.6-28
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user