rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea-system-tzdata.patch, NONE, 1.1 java-1.7.0-icedtea.spec, 1.11, 1.12
Thomas Fitzsimmons (fitzsim)
fedora-extras-commits at redhat.com
Thu Sep 27 18:45:28 UTC 2007
Author: fitzsim
Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16041
Modified Files:
java-1.7.0-icedtea.spec
Added Files:
java-1.7.0-icedtea-system-tzdata.patch
Log Message:
* Thu Sep 27 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.16.b19.snapshot
- Apply patch to use system tzdata.
- Require tzdata-java.
- Fix mauve shell fragment.
java-1.7.0-icedtea-system-tzdata.patch:
--- NEW FILE java-1.7.0-icedtea-system-tzdata.patch ---
diff -urN Makefile.am ../icedtea-1.4/Makefile.am
--- Makefile.am 2007-09-27 14:22:56.000000000 -0400
+++ ../icedtea-1.4/Makefile.am 2007-09-27 14:23:32.000000000 -0400
@@ -158,6 +158,7 @@
patches/icedtea-lesstif_amd64.patch \
patches/icedtea-tools.patch \
patches/icedtea-certbundle.patch \
+ patches/icedtea-system-tzdata.patch \
$(FAST_BUILD_PATCH)
stamps/patch.stamp: stamps/extract.stamp
diff -urN Makefile.in ../icedtea-1.4/Makefile.in
--- Makefile.in 2007-09-27 14:22:56.000000000 -0400
+++ ../icedtea-1.4/Makefile.in 2007-09-27 14:24:51.000000000 -0400
@@ -287,6 +287,7 @@
patches/icedtea-lesstif_amd64.patch \
patches/icedtea-tools.patch \
patches/icedtea-certbundle.patch \
+ patches/icedtea-system-tzdata.patch \
$(FAST_BUILD_PATCH)
diff -urN patches/icedtea-system-tzdata.patch ../icedtea-1.4/patches/icedtea-system-tzdata.patch
--- patches/icedtea-system-tzdata.patch 1969-12-31 19:00:00.000000000 -0500
+++ ../icedtea-1.4/patches/icedtea-system-tzdata.patch 2007-09-27 14:30:21.000000000 -0400
@@ -0,0 +1,54 @@
+diff -urN openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2007-09-27 14:27:03.000000000 -0400
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2007-09-27 14:29:21.000000000 -0400
+@@ -376,7 +376,6 @@
+ }
+ }
+
+- // Use the system zoneinfo files, if present
+ SystemProperty* sp = Arguments::system_properties();
+ Arguments::PropertyList_add (&sp,
+ "javax.net.ssl.trustStore",
+@@ -391,6 +390,10 @@
+ "javax.net.ssl.trustStorePassword",
+ "");
+
++ // Use the system zoneinfo files, if present
++ Arguments::PropertyList_add (&sp,
++ "user.zoneinfo.dir", "/usr/share/javazi");
++
+ #undef malloc
+ #undef getenv
+ #undef EXTENSIONS_DIR
+diff -urN openjdk.orig/j2se/src/share/classes/sun/util/calendar/ZoneInfoFile.java openjdk/j2se/src/share/classes/sun/util/calendar/ZoneInfoFile.java
+--- openjdk.orig/j2se/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2007-08-30 03:55:53.000000000 -0400
++++ openjdk/j2se/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2007-09-27 14:29:45.000000000 -0400
+@@ -1021,10 +1021,24 @@
+ byte[] buffer = null;
+
+ try {
+- String homeDir = (String) AccessController.doPrivileged(
+- new sun.security.action.GetPropertyAction("java.home"));
+- final String fname = homeDir + File.separator + "lib" + File.separator
+- + "zi" + File.separator + fileName;
++ String zi_dir = (String) System.getProperty("user.zoneinfo.dir");
++ File dir = null;
++ if (zi_dir != null)
++ dir = new File(zi_dir);
++
++ // Some minimal sanity checking
++ if (dir != null) {
++ File f = new File(dir, "ZoneInfoMappings");
++ if (!f.exists())
++ dir = null;
++ }
++
++ if (dir == null) {
++ String homeDir = (String) System.getProperty("java.home");
++ zi_dir = homeDir + File.separator + "lib" + File.separator
++ + "zi";
++ }
++ final String fname = zi_dir + File.separator + fileName;
+ buffer = (byte[]) AccessController.doPrivileged(new PrivilegedExceptionAction() {
+ public Object run() throws IOException {
+ File file = new File(fname);
Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- java-1.7.0-icedtea.spec 27 Sep 2007 12:28:00 -0000 1.11
+++ java-1.7.0-icedtea.spec 27 Sep 2007 18:44:55 -0000 1.12
@@ -95,7 +95,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: 0.15.%{openjdkver}.%{icedtearelease}%{?dist}
+Release: 0.16.%{openjdkver}.%{icedtearelease}%{?dist}
Summary: IcedTea Runtime Environment
Group: Development/Languages
@@ -116,6 +116,7 @@
Patch0: java-1.7.0-icedtea-makefile.patch
Patch1: java-1.7.0-icedtea-jhat.patch
Patch2: java-1.7.0-icedtea-win32.patch
+Patch3: java-1.7.0-icedtea-system-tzdata.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -150,6 +151,8 @@
# Require /etc/pki/tls/certs/ca-bundle.crt instead of generating
# cacerts.
Requires: openssl
+# Require zoneinfo data provided by tzdata-java subpackage.
+Requires: tzdata-java
# Post requires alternatives to install tool alternatives.
Requires(post): %{_sbindir}/alternatives
# Postun requires alternatives to uninstall tool alternatives.
@@ -266,6 +269,7 @@
%setup -q -n icedtea-%{icedteaver} -T -D -a 6
%setup -q -n icedtea-%{icedteaver} -T -D -a 2
%patch0
+%patch3
cp %{SOURCE4} .
cp %{SOURCE5} .
@@ -295,10 +299,8 @@
./configure
make
echo ====================MAUVE TESTING========================
- %{expand:
- $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
- -showpasses -debug -timeout 30000 2>&1 || :
- }
+ $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
+ -showpasses -debug -timeout 30000 2>&1 || :
echo ====================MAUVE TESTING END====================
popd
@@ -730,15 +732,22 @@
%{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
%changelog
+* Thu Sep 27 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.16.b19.snapshot
+- Apply patch to use system tzdata.
+- Require tzdata-java.
+- Fix mauve shell fragment.
+
* Thu Sep 27 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
- Removed jtreg setup line.
* Wed Sep 26 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
-- Removed jtreg. Does not adhere to Fedora guidelines.
+- Removed jtreg. Does not adhere to Fedora guidelines.
* Tue Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
-- Fixed running of Xvfb so it does not terminate after a successful test.
-- Fixed mauve and jtreg test runs to not break the build when an error is thrown
+- Fixed running of Xvfb so it does not terminate after a successful
+ test.
+- Fixed mauve and jtreg test runs to not break the build when an error
+ is thrown
* Mon Sep 24 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
- Added JTreg zip as source
More information about the fedora-extras-commits
mailing list