- mksh compat fixes from mira|AO@freenode

[packages/autoconf.git] / autoconf.spec

diff --git a/autoconf.spec b/autoconf.spec
index d916af3dc162c1e8a7483ad1c59e5aab78cfc1d1..bff6667db2fdbcf2b83906a376d4194c95dccaf5 100644 (file)
--- a/autoconf.spec
+++ b/autoconf.spec
@@ -2,11 +2,12 @@
 # Conditional build:
 %bcond_without emacs   # without emacs autoconf-mode
 %bcond_without xemacs  # without XEmacs autoconf-mode
-%bcond_without tests
-#
+%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
@@ -19,22 +20,20 @@ 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.66
-# wait until http://lists.gnu.org/archive/html/autoconf/2010-07/msg00004.html is fixed in upstream git tree
-Release:       1.1
+Version:       2.69
+Release:       3
 License:       GPL v2+/v3+
 Group:         Development/Building
 # stable releases:
 Source0:       http://ftp.gnu.org/gnu/autoconf/%{name}-%{version}.tar.xz
-# Source0-md5: adbe7e7fde3c34a400d33a8ac631c877
+# 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
-# it's unknown why this patch is here but it causes testsuite to fail
-Patch4:                %{name}-gettext.patch
+Patch4:                %{name}-mksh.patch
 URL:           http://www.gnu.org/software/autoconf/
 %{?with_emacs:BuildRequires:   emacs}
 BuildRequires: xz
@@ -47,6 +46,7 @@ BuildConflicts:       m4 = 1.4o
 Requires:      /bin/awk
 Requires:      diffutils
 Conflicts:     gettext < 0.10.38-3
+Conflicts:     pkgconfig < 1:0.25-2
 %requires_eq   m4
 Requires:      mktemp
 Obsoletes:     autoconf252
@@ -202,10 +202,12 @@ Tryb edycji autoconf dla emacsa.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-#%patch4 -p1
+%patch4 -p0
 
 %build
 %configure \
+       --host=%{_host} \
+       --build=%{_host} \
        %{?with_xemacs:EMACS=xemacs}
 %{__make} -j1