From 0a46deb16d393be55f3ede0f827f981a458eb382 Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm@fedoraproject.org>
Date: Thu, 19 Nov 2009 09:21:31 +0000
Subject: [PATCH] death to autoconf

---
 icu.XXXX.buildfix.patch | 25 +++++++++++++++++++++++++
 icu.XXXX.install.patch  | 11 -----------
 icu.spec                | 14 ++++++++------
 3 files changed, 33 insertions(+), 17 deletions(-)
 create mode 100644 icu.XXXX.buildfix.patch
 delete mode 100644 icu.XXXX.install.patch

diff --git a/icu.XXXX.buildfix.patch b/icu.XXXX.buildfix.patch
new file mode 100644
index 0000000..182b317
--- /dev/null
+++ b/icu.XXXX.buildfix.patch
@@ -0,0 +1,25 @@
+--- icu/source/Makefile.in	2009-08-31 21:15:03.000000000 +0100
++++ icu/source/Makefile.in	2009-08-31 21:19:23.000000000 +0100
+@@ -146,7 +146,7 @@
+ install-doc: doc
+ 	$(RM) -r $(DESTDIR)$(docdir)/$(docsubdir)
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(docdir)/$(docsubdir)
+-	$(INSTALL_DATA) doc/html/* $(DESTDIR)$(docdir)/$(docsubdir)
++	cp -r doc/html/* $(DESTDIR)$(docdir)/$(docsubdir)
+ endif
+ 
+ $(DESTDIR)$(pkglibdir)/%: $(top_srcdir)/../data/%
+--- icu/source/configure.in	2009-07-01 19:51:26.000000000 +0100
++++ icu/source/configure.in	2009-11-19 09:12:23.000000000 +0000
+@@ -57,6 +57,11 @@
+ 
+ AC_SUBST(cross_compiling)
+ 
++dnl use the pld hack to get ac_fn_cxx_try_link defined globally and not local
++AC_LANG_PUSH([C++])
++AC_LINK_IFELSE([AC_LANG_PROGRAM()])
++AC_LANG_POP([C++])
++
+ # make sure install is relative to srcdir - if a script
+ if test "$srcdir" = "."; then
+   # If srcdir isn't just ., then (srcdir) is already prepended.
diff --git a/icu.XXXX.install.patch b/icu.XXXX.install.patch
deleted file mode 100644
index b045510..0000000
--- a/icu.XXXX.install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- icu/source/Makefile.in.orig	2009-08-31 21:15:03.000000000 +0100
-+++ icu/source/Makefile.in	2009-08-31 21:19:23.000000000 +0100
-@@ -146,7 +146,7 @@
- install-doc: doc
- 	$(RM) -r $(DESTDIR)$(docdir)/$(docsubdir)
- 	$(MKINSTALLDIRS) $(DESTDIR)$(docdir)/$(docsubdir)
--	$(INSTALL_DATA) doc/html/* $(DESTDIR)$(docdir)/$(docsubdir)
-+	cp -r doc/html/* $(DESTDIR)$(docdir)/$(docsubdir)
- endif
- 
- $(DESTDIR)$(pkglibdir)/%: $(top_srcdir)/../data/%
diff --git a/icu.spec b/icu.spec
index 13e790c..8a7e696 100644
--- a/icu.spec
+++ b/icu.spec
@@ -1,6 +1,6 @@
 Name:      icu
 Version:   4.2.1
-Release:   6%{?dist}
+Release:   7%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT
@@ -16,8 +16,7 @@ Patch2:  icu.icu6284.strictalias.patch
 Patch3:  icu.6995.kannada.patch
 Patch4:  icu.icu7039.badextract.patch
 Patch5:  icu.6969.pkgdata.patch
-Patch6:  icu.XXXX.install.patch
-Patch7:  icu.7119.s390x.patch
+Patch6:  icu.XXXX.buildfix.patch
 
 %description
 Tools and utilities for developing with icu.
@@ -62,8 +61,7 @@ BuildArch: noarch
 %patch3 -p1 -b .icu6995.kannada.patch
 %patch4 -p1 -b .icu7039.badextract.patch
 %patch5 -p0 -b .icu.6969.pkgdata.patch
-%patch6 -p1 -b .icu.XXXX.install.patch
-%patch7 -p1 -b .icu.7119.s390x.patch
+%patch6 -p1 -b .icu.XXXX.buildfix.patch
 
 %build
 cd source
@@ -142,7 +140,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc source/__docs/%{name}/html/*
 
 %changelog
-* Tue Sep 01 2009 Caolan McNamara <caolanm@redhat.com> - 4.2.1-6
+* Thu Nov 19 2009 Caolan McNamara <caolanm@redhat.com> - 4.2.1-7
+- Fix FTBFS with yet another autoconf version that changes
+  behaviour
+
+* Mon Aug 31 2009 Caolan McNamara <caolanm@redhat.com> - 4.2.1-6
 - Resolves: rhbz#520468 fix s390x and other secondary archs
 
 * Tue Jul 28 2009 Caolan McNamara <caolanm@redhat.com> - 4.2.1-5