OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 30-Apr-2009 21:09:04
Branch: HEAD Handle: 2009043020090400
Modified files:
openpkg-src/icu icu.patch icu.spec
Log:
upgrading package: icu 3.8 -> 4.2
Summary:
Revision Changes Path
1.4 +27 -19 openpkg-src/icu/icu.patch
1.18 +4 -3 openpkg-src/icu/icu.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/icu/icu.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 icu.patch
--- openpkg-src/icu/icu.patch 27 Oct 2007 14:58:52 -0000 1.3
+++ openpkg-src/icu/icu.patch 30 Apr 2009 19:09:04 -0000 1.4
@@ -1,7 +1,7 @@
Index: source/config/Makefile.inc.in
---- source/config/Makefile.inc.in.orig 2005-07-23 00:58:08 +0200
-+++ source/config/Makefile.inc.in 2006-10-15 20:08:10 +0200
-@@ -38,7 +38,7 @@
+--- 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
+@@ -39,7 +39,7 @@
UNICODE_VERSION = @UNICODE_VERSION@
# The prefix for ICU libraries, normally 'icu'
@@ -10,7 +10,7 @@
PACKAGE = @PACKAGE@
LIBICU = lib$(ICUPREFIX)
-@@ -112,7 +112,7 @@
+@@ -113,7 +113,7 @@
ICULIBS_BASE = $(LIBS) -L$(libdir)
# for icu-config to test with
@@ -20,9 +20,9 @@
# 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 2005-09-20 22:32:08 +0200
-+++ source/icudefs.mk.in 2006-10-15 20:08:10 +0200
-@@ -126,7 +126,7 @@
+--- 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
@@ -31,15 +31,23 @@
# What kind of libraries are we building and linking against?
ENABLE_STATIC = @ENABLE_STATIC@
-Index: source/common/putil.c
---- source/common/putil.c.orig 2007-09-14 01:18:00 +0200
-+++ source/common/putil.c 2007-10-27 16:40:08 +0200
-@@ -576,7 +576,7 @@
- #if !UCONFIG_NO_FILE_IO && (defined(U_DARWIN) || defined(U_LINUX) ||
defined(U_BSD))
- /* These platforms are likely to use Olson timezone IDs. */
- #define CHECK_LOCALTIME_LINK 1
--#if defined(U_LINUX)
-+#if defined(U_LINUX) || defined(U_BSD)
- #define TZDEFAULT "/etc/localtime"
- #define TZZONEINFO "/usr/share/zoneinfo/"
- #else
+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 @@
+ 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)/$(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)/$(BREAK_TREE)
++ $(MKINSTALLDIRS)
$(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(COLLATION_TREE)
++ $(MKINSTALLDIRS)
$(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(RBNF_TREE)
++ $(MKINSTALLDIRS)
$(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(TRANSLIT_TREE)
+ endif
+ ifneq ($(ENABLE_STATIC),)
+ ifeq ($(PKGDATA_MODE),dll)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/icu/icu.spec
============================================================================
$ cvs diff -u -r1.17 -r1.18 icu.spec
--- openpkg-src/icu/icu.spec 18 Apr 2009 13:11:14 -0000 1.17
+++ openpkg-src/icu/icu.spec 30 Apr 2009 19:09:04 -0000 1.18
@@ -22,8 +22,8 @@
##
# package version
-%define V_opkg 3.8
-%define V_dist 3_8
+%define V_opkg 4.2
+%define V_dist 4_2_d01
# package information
Name: icu
@@ -36,7 +36,7 @@
Group: Charset
License: IBM Open Source
Version: %{V_opkg}
-Release: 20080101
+Release: 20090430
# list of sources
Source0:
http://download.icu-project.org/files/icu4c/%{V_opkg}/icu4c-%{V_dist}-src.tgz
@@ -79,6 +79,7 @@
LDFLAGS="%{l_ldflags}" \
./configure \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
--sysconfdir=%{l_prefix}/etc/icu \
--includedir=%{l_prefix}/include/icu \
--with-data-packaging=files \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
