diff --git a/0002-Fix-have-snprintf-error.patch b/0002-Fix-have-snprintf-error.patch deleted file mode 100644 index cafdf4d..0000000 --- a/0002-Fix-have-snprintf-error.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nrup a/Makefile b/Makefile ---- a/Makefile 2017-10-23 18:03:40.237177646 -0400 -+++ b/Makefile 2017-10-23 18:06:20.060683518 -0400 -@@ -292,7 +292,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fn - # January's first Monday when a "%V" format is used and January 1 - # falls on a Friday, Saturday, or Sunday. - --CFLAGS= -+CFLAGS= -DHAVE_SNPRINTF=1 - - # Linker flags. Default to $(LFLAGS) for backwards compatibility - # to release 2012h and earlier. diff --git a/javazic-fixup.patch b/javazic-fixup.patch deleted file mode 100644 index 8b19ef4..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/tzdata.spec b/tzdata.spec index 64fb306..16936f7 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,14 +1,12 @@ Name: tzdata Version: 2019b -Release: 8 +Release: 9 Summary: Timezone data License: Public Domain URL: https://www.iana.org/time-zones Source0: https://data.iana.org/time-zones/releases/tzdata%{version}.tar.gz Source1: https://data.iana.org/time-zones/releases/tzcode%{version}.tar.gz -Patch002: 0002-Fix-have-snprintf-error.patch - Patch6000: backport-Fiji-observes-DST-from-2019-11-10-to-2020-01-12.patch Patch6001: backport-Norfolk-Island-starts-observing-Australian-style-DST.patch Patch6002: backport-Rename-America-Godthab-to-America-Nuuk.patch @@ -33,7 +31,6 @@ the world. Summary: Timezone data for Java Source3: javazic.tar.gz Source4: javazic-1.8-37392f2f5d59.tar.xz -Patch100: javazic-fixup.patch %description java This package contains timezone information for use by Java runtimes. @@ -41,8 +38,6 @@ This package contains timezone information for use by Java runtimes. %prep %setup -q -c -a 1 -%patch002 -p1 - %patch6000 -p1 %patch6001 -p1 %patch6002 -p1 @@ -61,7 +56,6 @@ rm tzdata.zi mkdir javazic tar zxf %{SOURCE3} -C javazic cd javazic -%patch100 mv sun rht find . -type f -name '*.java' -print0 \ @@ -124,6 +118,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Thu Jan 9 2020 liuchao - 2019b-9 +- Type:recommended +- ID:NA +- SUG:NA +- DESC:remove useless patches + * Wed Jan 8 2020 liuchao - 2019b-8 - Type:bugfix - ID:NA