From 682f6e2a53c4636320622db082c9bf494efcb7b4aa0d34f58474eee9a1618023 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 8 Apr 2022 20:46:12 +0000 Subject: [PATCH] Accepting request 967836 from Java:Factory fix build in factory OBS-URL: https://build.opensuse.org/request/show/967836 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/javazic?expand=0&rev=14 --- javazic-fixup.patch | 34 ---------------------------------- javazic.changes | 13 +++++++++++++ javazic.spec | 21 ++++++++------------- javazic.tar.gz | 4 ++-- 4 files changed, 23 insertions(+), 49 deletions(-) delete mode 100644 javazic-fixup.patch diff --git a/javazic-fixup.patch b/javazic-fixup.patch deleted file mode 100644 index 67bd882..0000000 --- a/javazic-fixup.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- sun/util/calendar/LocalGregorianCalendar.java.keiths 2007-09-07 14:48:19.000000000 -0700 -+++ sun/util/calendar/LocalGregorianCalendar.java 2007-09-07 14:52:58.000000000 -0700 -@@ -120,8 +120,7 @@ public class LocalGregorianCalendar exte - static LocalGregorianCalendar getLocalGregorianCalendar(String name) { - Properties calendarProps = null; - try { -- String homeDir = (String) AccessController.doPrivileged( -- new sun.security.action.GetPropertyAction("java.home")); -+ String homeDir = (String) System.getProperty("java.home"); - final String fname = homeDir + File.separator + "lib" + File.separator - + "calendars.properties"; - calendarProps = (Properties) AccessController.doPrivileged(new PrivilegedExceptionAction() { ---- sun/util/calendar/ZoneInfoFile.java.keiths 2007-09-07 14:54:58.000000000 -0700 -+++ sun/util/calendar/ZoneInfoFile.java 2007-09-07 14:55:36.000000000 -0700 -@@ -1021,8 +1021,7 @@ public class ZoneInfoFile { - byte[] buffer = null; - - try { -- String zi_dir = (String) AccessController.doPrivileged( -- new sun.security.action.GetPropertyAction("user.zoneinfo.dir")); -+ String zi_dir = (String) System.getProperty("user.zoneinfo.dir"); - File dir = null; - if (zi_dir != null) - dir = new File(zi_dir); -@@ -1035,8 +1034,7 @@ public class ZoneInfoFile { - } - - if (dir == null) { -- String homeDir = (String) AccessController.doPrivileged( -- new sun.security.action.GetPropertyAction("java.home")); -+ String homeDir = (String) System.getProperty("java.home"); - zi_dir = homeDir + File.separator + "lib" + File.separator - + "zi"; - } diff --git a/javazic.changes b/javazic.changes index 8a730a4..fd398ee 100644 --- a/javazic.changes +++ b/javazic.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Apr 8 13:48:45 UTC 2022 - Fridrich Strba + +- Removed patch: + * javazic-fixup.patch + + not needed any more + +------------------------------------------------------------------- +Thu Oct 18 09:41:04 UTC 2018 - Fridrich Strba + +- Update the sources with the recent versions from jdk7u tree +- Build with source/target 7 + ------------------------------------------------------------------- Mon Oct 2 14:02:52 UTC 2017 - fstrba@suse.com diff --git a/javazic.spec b/javazic.spec index 7a18c4f..3ed3d10 100644 --- a/javazic.spec +++ b/javazic.spec @@ -1,7 +1,7 @@ # # spec file for package javazic # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,22 +12,20 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: javazic -# javazic source codes comes from openjdk6-b09 source archive -# see package java-1_6_0-java for details and source code -Version: 1.6.0 +# javazic source codes comes from jdk7u/jdk mercurial +Version: 1.7.0 Release: 0 Summary: A time zone compiler for Java License: GPL-2.0-with-classpath-exception Group: Development/Libraries/Java -Url: http://icedtea.classpath.org +URL: https://icedtea.classpath.org Source0: javazic.tar.gz -Patch0: javazic-fixup.patch -BuildRequires: java-devel +BuildRequires: java-devel >= 1.7 BuildArch: noarch %description @@ -36,13 +34,10 @@ derived from openjdk6 source code. %prep %setup -q -c %{name}-%{version} -%patch0 -b .javazic-fixup %build -mv sun/util sun/whatever -perl -pi -e 's#sun\.util\.calendar#sun\.whatever\.calendar#g' $(find sun/ -iname '*.java') -javac -source 6 -target 6 $(find sun/ -iname '*.java') -echo "Main-Class: sun.tools.javazic.Main" > manifest.txt +javac -source 7 -target 7 $(find build/ -iname '*.java') +echo "Main-Class: build.tools.javazic.Main" > manifest.txt jar -cfm %{name}-%{version}.jar manifest.txt $(find . -iname '*.class') %install diff --git a/javazic.tar.gz b/javazic.tar.gz index 2dab533..2e8665e 100644 --- a/javazic.tar.gz +++ b/javazic.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb7cc0c75205e6aed9cf6dee2a9c84f5a91e3790afadb8f3361b849ddf642838 -size 57271 +oid sha256:dd4d6ccb11105255bf951cca0a2ce6a2294ee3e6d7236c82d9e68329aa7cfe73 +size 63620