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

@@ -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";
- 	    }

javazic.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Apr  8 13:48:45 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Removed patch:
+  * javazic-fixup.patch
+    + not needed any more
+
+-------------------------------------------------------------------
+Thu Oct 18 09:41:04 UTC 2018 - Fridrich Strba <fstrba@suse.com>
+
+- 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
 

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
+# javazic source codes comes from jdk7u/jdk mercurial
-# see package java-1_6_0-java for details and source code
+Version:        1.7.0
-Version:        1.6.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 >= 1.7
-BuildRequires:  java-devel
 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
+javac -source 7 -target 7 $(find build/ -iname '*.java')
-perl -pi -e 's#sun\.util\.calendar#sun\.whatever\.calendar#g' $(find sun/ -iname '*.java')
+echo "Main-Class: build.tools.javazic.Main" > manifest.txt
-javac -source 6 -target 6 $(find sun/ -iname '*.java')
-echo "Main-Class: sun.tools.javazic.Main" > manifest.txt
 jar -cfm %{name}-%{version}.jar manifest.txt $(find . -iname '*.class')
 
 %install