Change default timezone path

/etc/localtime -> /opt/etc/localtime

Change-Id: I36b59660fe785412f5265ce7195f17512a5e8a00

diff --git a/packaging/Change_localtime_path.patch b/packaging/Change_localtime_path.patch
new file mode 100644 (file)
index 0000000..5fffdcc
--- /dev/null
+++ b/packaging/Change_localtime_path.patch
@@ -0,0 +1,13 @@
+diff --git a/source/common/putil.cpp b/source/common/putil.cpp
+index 6c23bffb2..8447d7d78 100644
+--- a/source/common/putil.cpp
++++ b/source/common/putil.cpp
+@@ -708,7 +708,7 @@ extern U_IMPORT char *U_TZNAME[];
+ #define TZZONEINFO      "/usr/share/lib/zoneinfo/"\r
+ #define TZ_ENV_CHECK    "localtime"\r
+ #else\r
+-#define TZDEFAULT       "/etc/localtime"\r
++#define TZDEFAULT       "/opt/etc/localtime"\r
+ #define TZZONEINFO      "/usr/share/zoneinfo/"\r
+ #endif\r
+ #define TZZONEINFOTAIL  "/zoneinfo/"\r

diff --git a/packaging/icu.spec b/packaging/icu.spec
index e64523e..92768e7 100644 (file)
--- a/packaging/icu.spec
+++ b/packaging/icu.spec
@@ -18,6 +18,7 @@ Source2:   set_disable_renameing.patch
 Source3:   Disable-the-default-LDFLAGSICUDT.patch
 Source4:   Add_PIE_option_for_tzcode.patch
 Source5:   Set_define_false_and_true.patch
+Source6:   Change_localtime_path.patch
 
 Source1001:    icu.manifest
 BuildRequires: doxygen
@@ -67,6 +68,7 @@ cp %{SOURCE1001} .
 %{__patch} -p1 < %{SOURCE3}
 %{__patch} -p1 < %{SOURCE4}
 %{__patch} -p1 < %{SOURCE5}
+%{__patch} -p1 < %{SOURCE6}
 
 %if "%{?profile}" == "tv"
 cp %{SOURCE1} ./source/tools/tzcode