diff --git a/icu/icu.patch b/icu/icu.patch index 020d6896cd..7a236aff24 100644 --- a/icu/icu.patch +++ b/icu/icu.patch @@ -1,6 +1,6 @@ Index: source/config/Makefile.inc.in ---- source/config/Makefile.inc.in.orig 2009-04-28 20:05:54 +0200 -+++ source/config/Makefile.inc.in 2009-04-29 20:48:07 +0200 +--- source/config/Makefile.inc.in.orig 2009-11-18 17:09:00 +0100 ++++ source/config/Makefile.inc.in 2010-01-09 21:12:40 +0100 @@ -39,7 +39,7 @@ UNICODE_VERSION = @UNICODE_VERSION@ @@ -19,31 +19,27 @@ Index: source/config/Makefile.inc.in # ICULIBS is the set of libraries your application should link # with usually. Many applications will want to add $(ICULIBS_I18N) as well. -Index: source/icudefs.mk.in ---- source/icudefs.mk.in.orig 2009-04-28 20:06:34 +0200 -+++ source/icudefs.mk.in 2009-04-29 20:48:07 +0200 -@@ -140,7 +140,7 @@ - ifeq ($(ENABLE_RPATH),YES) - RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) - endif --LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -+LDFLAGS = -L$(LIBDIR) -L$(top_builddir)/stubdata @LDFLAGS@ $(RPATHLDFLAGS) - - # What kind of libraries are we building and linking against? - ENABLE_STATIC = @ENABLE_STATIC@ Index: source/data/Makefile.in ---- source/data/Makefile.in.orig 2009-04-28 20:06:32 +0200 -+++ source/data/Makefile.in 2009-04-30 08:42:30 +0200 -@@ -164,11 +164,11 @@ +--- source/data/Makefile.in.orig 2009-11-18 17:09:48 +0100 ++++ source/data/Makefile.in 2010-01-09 21:14:08 +0100 +@@ -176,15 +176,15 @@ install-local: $(PKGDATA_LIST) ./icupkg.inc packagedata $(OS390INSTALL) $(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(ICUPKGDATA_DIR) ifeq ($(PKGDATA_MODE),files) - $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME) +- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(CURR_TREE) +- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(LANG_TREE) +- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(REGION_TREE) +- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(ZONE_TREE) - $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(BREAK_TREE) - $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(COLLATION_TREE) - $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(RBNF_TREE) - $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(TRANSLIT_TREE) + $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME) ++ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(CURR_TREE) ++ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(LANG_TREE) ++ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(REGION_TREE) ++ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(ZONE_TREE) + $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(BREAK_TREE) + $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(COLLATION_TREE) + $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(RBNF_TREE) @@ -51,3 +47,15 @@ Index: source/data/Makefile.in endif ifneq ($(ENABLE_STATIC),) ifeq ($(PKGDATA_MODE),dll) +Index: source/icudefs.mk.in +--- source/icudefs.mk.in.orig 2009-11-18 17:09:54 +0100 ++++ source/icudefs.mk.in 2010-01-09 21:12:40 +0100 +@@ -148,7 +148,7 @@ + ifeq ($(ENABLE_RPATH),YES) + RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) + endif +-LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) ++LDFLAGS = -L$(LIBDIR) -L$(top_builddir)/stubdata @LDFLAGS@ $(RPATHLDFLAGS) + + # What kind of libraries are we building and linking against? + ENABLE_STATIC = @ENABLE_STATIC@ diff --git a/icu/icu.spec b/icu/icu.spec index 3a2ca08804..8739d9e336 100644 --- a/icu/icu.spec +++ b/icu/icu.spec @@ -22,8 +22,8 @@ ## # package version -%define V_opkg 4.3.1 -%define V_dist 4_3_1 +%define V_opkg 4.3.3 +%define V_dist 4_3_3 # package information Name: icu @@ -36,7 +36,7 @@ Class: PLUS Group: Charset License: IBM Open Source Version: %{V_opkg} -Release: 20090724 +Release: 20100109 # list of sources Source0: http://download.icu-project.org/files/icu4c/%{V_opkg}/icu4c-%{V_dist}-src.tgz