rpms/icu
7
0
Fork 0
Code Issues Pull Requests Releases Activity

death to autoconf

Browse Source
This commit is contained in:
Caolan McNamara 2009-11-19 09:21:31 +00:00
parent f23526ea24
commit 0a46deb16d
3 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
icu.XXXX.buildfix.patch Normal file
View File

@ -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.

11
icu.XXXX.install.patch
View File

@ -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/%

14
icu.spec
View File

@ -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