已合并
remove tzdata-java dependencies #459
douyiwang创建于 4月8日
remove tzdata-java dependencies #459
已合并
共 1 个文件变更+8-5
| @@ -674,7 +674,7 @@ Requires: ca-certificates | |||
| 674 | # Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros | 674 | # Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros |
| 675 | Requires: javapackages-filesystem | 675 | Requires: javapackages-filesystem |
| 676 | # Require zone-info data provided by tzdata-java sub-package | 676 | # Require zone-info data provided by tzdata-java sub-package |
| 677 | -Requires: tzdata-java >= 2019c | 677 | +# Requires: tzdata-java >= 2019c |
| 678 | # for support of kernel stream control | 678 | # for support of kernel stream control |
| 679 | # libsctp.so.1 is being `dlopen`ed on demand | 679 | # libsctp.so.1 is being `dlopen`ed on demand |
| 680 | Requires: lksctp-tools%{?_isa} | 680 | Requires: lksctp-tools%{?_isa} |
| @@ -773,7 +773,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} | |||
| 773 | 773 | ||
| 774 | Name: java-%{javaver}-%{origin} | 774 | Name: java-%{javaver}-%{origin} |
| 775 | Version: %{newjavaver}.%{buildver} | 775 | Version: %{newjavaver}.%{buildver} |
| 776 | -Release: 6 | 776 | +Release: 7 |
| 777 | # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons | 777 | # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons |
| 778 | # and this change was brought into RHEL-4. java-1.5.0-ibm packages | 778 | # and this change was brought into RHEL-4. java-1.5.0-ibm packages |
| 779 | # also included the epoch in their virtual provides. This created a | 779 | # also included the epoch in their virtual provides. This created a |
| @@ -978,7 +978,7 @@ BuildRequires: zip | |||
| 978 | BuildRequires: unzip | 978 | BuildRequires: unzip |
| 979 | BuildRequires: javapackages-filesystem | 979 | BuildRequires: javapackages-filesystem |
| 980 | BuildRequires: java-%{buildjdkver}-openjdk-devel | 980 | BuildRequires: java-%{buildjdkver}-openjdk-devel |
| 981 | -BuildRequires: tzdata-java >= 2020a | 981 | +# BuildRequires: tzdata-java >= 2020a |
| 982 | # Earlier versions have a bug in tree vectorization on PPC | 982 | # Earlier versions have a bug in tree vectorization on PPC |
| 983 | BuildRequires: gcc >= 4.8.3-8 | 983 | BuildRequires: gcc >= 4.8.3-8 |
| 984 | # Build requirements for SunEC system NSS support | 984 | # Build requirements for SunEC system NSS support |
| @@ -1432,8 +1432,8 @@ export JAVA_HOME=$(pwd)/%{buildoutputdir -- $suffix}/images/%{jdkimage} | |||
| 1432 | install -m 644 nss.cfg $JAVA_HOME/conf/security/ | 1432 | install -m 644 nss.cfg $JAVA_HOME/conf/security/ |
| 1433 | 1433 | ||
| 1434 | # Use system-wide tzdata | 1434 | # Use system-wide tzdata |
| 1435 | -rm $JAVA_HOME/lib/tzdb.dat | 1435 | +# rm $JAVA_HOME/lib/tzdb.dat |
| 1436 | -ln -s %{_datadir}/javazi-1.8/tzdb.dat $JAVA_HOME/lib/tzdb.dat | 1436 | +# ln -s %{_datadir}/javazi-1.8/tzdb.dat $JAVA_HOME/lib/tzdb.dat |
| 1437 | 1437 | ||
| 1438 | # build cycles | 1438 | # build cycles |
| 1439 | done | 1439 | done |
| @@ -1800,6 +1800,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect | |||
| 1800 | 1800 | ||
| 1801 | 1801 | ||
| 1802 | %changelog | 1802 | %changelog |
| 1803 | +* Wed Apr 8 2026 douyiwang <douyiwang@huawei.com> -1:11.0.30.7-7 | ||
| 1804 | +- remove tzdata-java dependencies | ||
| 1805 | + | ||
| 1803 | * Thu Apr 2 2026 douyiwang <douyiwang@huawei.com> -1:11.0.30.7-6 | 1806 | * Thu Apr 2 2026 douyiwang <douyiwang@huawei.com> -1:11.0.30.7-6 |
| 1804 | - change boot-jdk to avoid tzdata-java limit | 1807 | - change boot-jdk to avoid tzdata-java limit |
| 1805 | 1808 | ||