[packages/icedtea6] use system tzdata

[glen]

commit ee6613bb3507cad357b1fab308e9d6bb32fe2f7d
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Mar 1 21:14:07 2015 +0200

    use system tzdata

 icedtea6.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/icedtea6.spec b/icedtea6.spec
index 581f3cf..805d32b 100644
--- a/icedtea6.spec
+++ b/icedtea6.spec
@@ -183,6 +183,8 @@ Summary:	OpenJDK and GNU Classpath code - runtime environment
 Summary(pl.UTF-8):	Kod OpenJDK i GNU Classpath - środowisko uruchomieniowe
 Group:		Development/Languages/Java
 Requires:	%{name}-jre-base = %{version}-%{release}
+# Require zoneinfo data provided by java-tzdata subpackage.
+Requires:	java-tzdata
 Provides:	java
 Provides:	java(ClassDataVersion) = %{_classdataversion}
 Provides:	java(jaas) = %{version}
@@ -484,6 +486,9 @@ done
 # some apps (like opera) looks for it in different place
 ln -s server/libjvm.so $RPM_BUILD_ROOT%{jredir}/lib/%{jre_arch}/libjvm.so
 
+# uses /usr/share/javazi if present and we require that package
+%{__rm} -r $RPM_BUILD_ROOT%{jredir}/lib/zi
+
 %{__rm} $RPM_BUILD_ROOT%{dstdir}/{,jre/}{ASSEMBLY_EXCEPTION,LICENSE,THIRD_PARTY_README}
 
 %{?with_cacerts:install cacerts $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/security}
@@ -744,8 +749,7 @@ rm -rf $RPM_BUILD_ROOT
 %{jredir}/lib/images
 %{jredir}/lib/management
 %{jredir}/lib/security
-%{jredir}/lib/zi
-#
+
 %if %{with webstart}
 %{jredir}/lib/about.jar
 %{jredir}/lib/about.jnlp
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/icedtea6.git/commitdiff/ee6613bb3507cad357b1fab308e9d6bb32fe2f7d