- zsh-autoconf.spec: fix for autoconf 2.60

Changed files:
    zsh-autoconf.patch -> 1.1
    zsh.spec -> 1.125

diff --git a/zsh-autoconf.patch b/zsh-autoconf.patch
new file mode 100644 (file)
index 0000000..ce07299
--- /dev/null
+++ b/zsh-autoconf.patch
@@ -0,0 +1,15 @@
+--- zsh-4.3.2/Src/mkmakemod.sh~        2005-08-09 11:55:18.000000000 +0200
++++ zsh-4.3.2/Src/mkmakemod.sh 2006-08-13 22:06:12.000000000 +0200
+@@ -111,9 +111,10 @@
+     sed -e '/^#/d' -e 's/ .*/ /' -e 's/^name=/ /'`"
+     module_list="${bin_mods}${dyn_mods}"
+ 
+-    # check both 2.13 and 2.50 syntax
++    # check 2.13, 2.50 and 2.60 syntaxes
+     if grep '%@D@%D%' config.status >/dev/null ||
+-       grep ',@D@,D,' config.status >/dev/null; then
++       grep ',@D@,D,' config.status >/dev/null ||
++       grep ',@D@,|#_!!_#|D,' config.status >/dev/null; then
+       is_dynamic=true
+     else
+       is_dynamic=false

diff --git a/zsh.spec b/zsh.spec
index 77ee952064b58dcf4dfdf459189a094b0e7bdfc1..51566151c599f7ab064ce6babb19680cd425a8d7 100644 (file)
--- a/zsh.spec
+++ b/zsh.spec
@@ -32,6 +32,7 @@ Patch1:               %{name}-addons.patch
 Patch2:                %{name}-paths.patch
 Patch3:                %{name}-completions.patch
 Patch4:                %{name}-nolibs.patch
+Patch5:                %{name}-autoconf.patch
 BuildRequires: autoconf
 BuildRequires: automake
 %{?with_static:BuildRequires:  glibc-static}
@@ -148,6 +149,7 @@ Podr
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 install %{SOURCE2} .