- added tests patch (fixes tests with libtool 2.4.x)

[packages/autoconf.git] / autoconf.spec

diff --git a/autoconf.spec b/autoconf.spec
index 39ebba310cc5180ba8de636ce3e7483400c4e43a..dbf228572f3e138434690108af6e077debc21043 100644 (file)
--- a/autoconf.spec
+++ b/autoconf.spec
@@ -2,10 +2,12 @@
 # Conditional build:
 %bcond_without emacs   # without emacs autoconf-mode
 %bcond_without xemacs  # without XEmacs autoconf-mode
-#
+%bcond_without tests   # do not perform "make check"
+
+# ???
 %undefine      with_emacs
 %undefine      with_xemacs
-#
+
 %include       /usr/lib/rpm/macros.perl
 Summary:       GNU autoconf - source configuration tools
 Summary(de.UTF-8):     Ein GNU-Hilfsmittel für Quellencode automatisch konfigurieren
@@ -18,38 +20,48 @@ Summary(pt_BR.UTF-8):       GNU autoconf - ferramentas de configuração de fontes
 Summary(ru.UTF-8):     GNU autoconf - автоконфигуратор исходных текстов
 Summary(uk.UTF-8):     GNU autoconf - автоконфігуратор вихідних текстів
 Name:          autoconf
-Version:       2.63
-Release:       3
+Version:       2.69
+Release:       5
 License:       GPL v2+/v3+
 Group:         Development/Building
 # stable releases:
-Source0:       http://ftp.gnu.org/gnu/autoconf/%{name}-%{version}.tar.lzma
-# Source0-md5: 670b25f8b42118d2313f7593d9d89fda
+Source0:       http://ftp.gnu.org/gnu/autoconf/%{name}-%{version}.tar.xz
+# Source0-md5: 50f97f4159805e374639a73e2636f22e
 # devel releases:
 #Source0:      http://alpha.gnu.org/gnu/autoconf/%{name}-%{version}.tar.bz2
 Patch0:                %{name}-mawk.patch
 Patch1:                %{name}-info.patch
 Patch2:                %{name}-AC_EGREP.patch
 Patch3:                %{name}-cxxcpp-warnonly.patch
-Patch4:                %{name}-gettext.patch
+Patch4:                %{name}-mksh.patch
+Patch5:                autoconf-2.69-perl-5.22-autoscan.patch
+Patch6:                %{name}-tests.patch
 URL:           http://www.gnu.org/software/autoconf/
 %{?with_emacs:BuildRequires:   emacs}
-BuildRequires: lzma >= 1:4.42
-BuildRequires: m4 >= 3:1.4.10-2
+BuildRequires: xz
+BuildRequires: m4 >= 3:1.4.13
 BuildRequires: rpm-perlprov
+BuildRequires: tar >= 1:1.22
 BuildRequires: texinfo >= 4.2
 %{?with_xemacs:BuildRequires:  xemacs}
 BuildConflicts:        m4 = 1.4o
-Conflicts:     gettext < 0.10.38-3
 Requires:      /bin/awk
 Requires:      diffutils
+Conflicts:     gettext < 0.10.38-3
+Conflicts:     pkgconfig < 1:0.25-2
 %requires_eq   m4
 Requires:      mktemp
-BuildArch:     noarch
 Obsoletes:     autoconf252
 Obsoletes:     autoconf253
+BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%if %{_host_cpu} == "x32"
+%define        build_arch %{_target_platform}
+%else
+%define        build_arch %{_host}
+%endif
+
 %define                _libdir         %{_datadir}
 
 %description
@@ -193,19 +205,24 @@ Emacs autoconf-mode.
 Tryb edycji autoconf dla emacsa.
 
 %prep
-%setup -q -c -T
-lzma -dc %{SOURCE0} | tar xf - -C ..
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
+%patch4 -p0
+%patch5 -p1
+%patch6 -p1
 
 %build
 %configure \
+       --host=%{build_arch} \
+       --build=%{build_arch} \
        %{?with_xemacs:EMACS=xemacs}
 %{__make} -j1
 
+%{?with_tests:%{__make} check}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -230,6 +247,8 @@ rm lib/emacs/*.elc
        lispdir=%{_emacs_lispdir}
 %endif
 
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+
 %clean
 rm -rf $RPM_BUILD_ROOT