Change-Id: I94e69da17e7d458fb649e781c97479b9a94003b2
Signed-off-by: Shreenidhi Shedi <sshedi@vmware.com>
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/18270
Tested-by: gerrit-photon <photon-checkins@vmware.com>
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
Summary: Microsoft .NET Core SDK |
| 4 | 4 |
Name: dotnet-sdk |
| 5 | 5 |
Version: 7.0.102 |
| 6 |
-Release: 1%{?dist}
|
|
| 6 |
+Release: 2%{?dist}
|
|
| 7 | 7 |
Vendor: VMware, Inc. |
| 8 | 8 |
Distribution: Photon |
| 9 | 9 |
License: MIT |
| ... | ... |
@@ -43,6 +43,8 @@ cp -pr sdk/%{version} %{buildroot}%{_libdir}/dotnet/sdk
|
| 43 | 43 |
%{_libdir}/*
|
| 44 | 44 |
|
| 45 | 45 |
%changelog |
| 46 |
+* Sun Feb 12 2023 Shreenidhi Shedi <sshedi@vmware.com> 7.0.102-2 |
|
| 47 |
+- Bump version as a part of icu upgrade |
|
| 46 | 48 |
* Sat Feb 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 7.0.102-1 |
| 47 | 49 |
- Upgrade to v7.0.102 |
| 48 | 50 |
* Thu Oct 06 2022 Shreenidhi Shedi <sshedi@vmware.com> 7.0.100-rc1.1 |
| ... | ... |
@@ -1,23 +1,23 @@ |
| 1 |
-Summary: International Components for Unicode |
|
| 2 |
-Name: icu |
|
| 3 |
-Version: 71.1 |
|
| 4 |
-Release: 1%{?dist}
|
|
| 5 |
-License: MIT and UCD and Public Domain |
|
| 6 |
-URL: http://www.icu-project.org |
|
| 7 |
-Group: System Environment/Libraries |
|
| 8 |
-Vendor: VMware, Inc. |
|
| 1 |
+Summary: International Components for Unicode |
|
| 2 |
+Name: icu |
|
| 3 |
+Version: 72.1 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 |
+License: MIT and UCD and Public Domain |
|
| 6 |
+URL: http://www.icu-project.org |
|
| 7 |
+Group: System Environment/Libraries |
|
| 8 |
+Vendor: VMware, Inc. |
|
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
|
| 11 |
-Source0: https://github.com/unicode-org/icu/archive/refs/tags/%{name}4c-71_1-src.tgz
|
|
| 12 |
-%define sha512 %{name}=1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912
|
|
| 11 |
+Source0: https://github.com/unicode-org/icu/archive/refs/tags/%{name}4c-72_1-src.tgz
|
|
| 12 |
+%define sha512 %{name}=848c341b37c0ff077e34a95d92c6200d5aaddd0ee5e06134101a74e04deb08256a5e817c8aefab020986abe810b7827dd7b2169a60dacd250c298870518dcae8
|
|
| 13 | 13 |
|
| 14 | 14 |
%description |
| 15 | 15 |
The International Components for Unicode (ICU) package is a mature, |
| 16 | 16 |
widely used set of C/C++ libraries providing Unicode and Globalization support for software applications. |
| 17 | 17 |
|
| 18 |
-%package devel |
|
| 19 |
-Summary: Header and development files |
|
| 20 |
-Requires: %{name} = %{version}-%{release}
|
|
| 18 |
+%package devel |
|
| 19 |
+Summary: Header and development files |
|
| 20 |
+Requires: %{name} = %{version}-%{release}
|
|
| 21 | 21 |
%description devel |
| 22 | 22 |
It contains the libraries and header files to create applications. |
| 23 | 23 |
|
| ... | ... |
@@ -47,6 +47,8 @@ It contains the libraries and header files to create applications. |
| 47 | 47 |
%{_libdir}/pkgconfig/*.pc
|
| 48 | 48 |
|
| 49 | 49 |
%changelog |
| 50 |
+* Sat Feb 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 72.1-1 |
|
| 51 |
+- Upgrade to v72.1 |
|
| 50 | 52 |
* Tue Oct 04 2022 Shreenidhi Shedi <sshedi@vmware.com> 71.1-1 |
| 51 | 53 |
- Upgrade to v71.1 |
| 52 | 54 |
* Mon Feb 28 2022 Shreenidhi Shedi <sshedi@vmware.com> 70.1-2 |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Libical — an implementation of iCalendar protocols and data formats |
| 2 | 2 |
Name: libical |
| 3 | 3 |
Version: 3.0.14 |
| 4 |
-Release: 3%{?dist}
|
|
| 4 |
+Release: 4%{?dist}
|
|
| 5 | 5 |
License: MPL-2.0 |
| 6 | 6 |
Group: System Environment/Libraries |
| 7 | 7 |
Vendor: VMware, Inc. |
| ... | ... |
@@ -74,6 +74,8 @@ make test ARGS="-V" %{?_smp_mflags}
|
| 74 | 74 |
%{_libdir}/pkgconfig/*.pc
|
| 75 | 75 |
|
| 76 | 76 |
%changelog |
| 77 |
+* Sat Feb 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 3.0.14-4 |
|
| 78 |
+- Bump version as a part of icu upgrade |
|
| 77 | 79 |
* Tue Oct 04 2022 Shreenidhi Shedi <sshedi@vmware.com> 3.0.14-3 |
| 78 | 80 |
- Bump version as a part of icu upgrade |
| 79 | 81 |
* Tue Jun 14 2022 Shreenidhi Shedi <sshedi@vmware.com> 3.0.14-2 |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: libpsl - C library to handle the Public Suffix List |
| 2 | 2 |
Name: libpsl |
| 3 | 3 |
Version: 0.21.1 |
| 4 |
-Release: 6%{?dist}
|
|
| 4 |
+Release: 7%{?dist}
|
|
| 5 | 5 |
License: MIT |
| 6 | 6 |
URL: https://github.com/rockdaboot/libpsl |
| 7 | 7 |
Group: System Environment/Development |
| ... | ... |
@@ -96,6 +96,8 @@ make %{?_smp_mflags} check
|
| 96 | 96 |
%{_libdir}/pkgconfig/*
|
| 97 | 97 |
|
| 98 | 98 |
%changelog |
| 99 |
+* Sat Feb 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 0.21.1-7 |
|
| 100 |
+- Bump version as a part of icu upgrade |
|
| 99 | 101 |
* Tue Dec 06 2022 Prashant S Chauhan <psinghchauha@vmware.com> 0.21.1-6 |
| 100 | 102 |
- Update release to compile with python 3.11 |
| 101 | 103 |
* Tue Oct 04 2022 Shreenidhi Shedi <sshedi@vmware.com> 0.21.1-5 |
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
Summary: SpiderMonkey JavaScript library |
| 4 | 4 |
Name: mozjs |
| 5 | 5 |
Version: 102.6.0 |
| 6 |
-Release: 2%{?dist}
|
|
| 6 |
+Release: 3%{?dist}
|
|
| 7 | 7 |
Group: Applications/System |
| 8 | 8 |
Vendor: VMware, Inc. |
| 9 | 9 |
License: GPLv2+ or LGPLv2+ or MPL-2.0 |
| ... | ... |
@@ -133,6 +133,8 @@ find %{buildroot} -name '*.la' -delete
|
| 133 | 133 |
%{_includedir}/%{name}-%{major}
|
| 134 | 134 |
|
| 135 | 135 |
%changelog |
| 136 |
+* Sat Feb 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 102.6.0-3 |
|
| 137 |
+- Bump version as a part of icu upgrade |
|
| 136 | 138 |
* Fri Dec 23 2022 Shreenidhi Shedi <sshedi@vmware.com> 102.6.0-2 |
| 137 | 139 |
- Bump version as a part of readline upgrade |
| 138 | 140 |
* Tue Dec 13 2022 Gerrit Photon <photon-checkins@vmware.com> 102.6.0-1 |
| ... | ... |
@@ -6,15 +6,16 @@ |
| 6 | 6 |
Summary: OpenJDK |
| 7 | 7 |
Name: openjdk11 |
| 8 | 8 |
Version: 11.0.12 |
| 9 |
-Release: 5%{?dist}
|
|
| 9 |
+Release: 6%{?dist}
|
|
| 10 | 10 |
License: GNU General Public License V2 |
| 11 | 11 |
URL: https://openjdk.java.net |
| 12 | 12 |
Group: Development/Tools |
| 13 | 13 |
Vendor: VMware, Inc. |
| 14 | 14 |
Distribution: Photon |
| 15 | 15 |
|
| 16 |
-Source0: http://www.java.net/download/openjdk/jdk/jdk11/openjdk-%{version}.tar.gz
|
|
| 16 |
+Source0: http://www.java.net/download/openjdk/jdk/jdk11/openjdk-%{version}.tar.gz
|
|
| 17 | 17 |
%define sha512 openjdk-11.0=1bc7878ccb73e495907c02718573b63c88f61581340e8038ab4f0abf6161ac355d7a1a420de4949192b7df951cd39a1d890f251cba4647d8fd425c72d92d0164 |
| 18 |
+ |
|
| 18 | 19 |
Patch0: CVE-2022-34169.patch |
| 19 | 20 |
|
| 20 | 21 |
BuildArch: x86_64 |
| ... | ... |
@@ -67,8 +68,8 @@ This package provides the runtime library class sources. |
| 67 | 67 |
|
| 68 | 68 |
%build |
| 69 | 69 |
chmod a+x ./configur* |
| 70 |
-unset JAVA_HOME && |
|
| 71 |
-ENABLE_HEADLESS_ONLY="true" && |
|
| 70 |
+unset JAVA_HOME |
|
| 71 |
+ENABLE_HEADLESS_ONLY="true" |
|
| 72 | 72 |
sh ./configur* \ |
| 73 | 73 |
--with-target-bits=64 \ |
| 74 | 74 |
--enable-headless-only \ |
| ... | ... |
@@ -98,7 +99,7 @@ make install |
| 98 | 98 |
install -vdm755 %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}
|
| 99 | 99 |
chown -R root:root %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}
|
| 100 | 100 |
install -vdm755 %{buildroot}%{_bindir}
|
| 101 |
-mv /usr/local/jvm/openjdk-%{version}-internal/* %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/
|
|
| 101 |
+mv %{_usr}/local/jvm/openjdk-%{version}-internal/* %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/
|
|
| 102 | 102 |
cp README LICENSE ASSEMBLY_EXCEPTION %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/
|
| 103 | 103 |
|
| 104 | 104 |
%post |
| ... | ... |
@@ -211,6 +212,8 @@ rm -rf %{buildroot}/* %{_libdir}/jvm/OpenJDK-*
|
| 211 | 211 |
%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/lib/src.zip
|
| 212 | 212 |
|
| 213 | 213 |
%changelog |
| 214 |
+* Sat Feb 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 11.0.12-6 |
|
| 215 |
+- Bump version as a part of icu upgrade |
|
| 214 | 216 |
* Fri Jan 06 2023 Vamsi Krishna Brahmajosyula <vbrahmajosyula@vmware.com> 11.0.12-5 |
| 215 | 217 |
- Bump up due to change in elfutils |
| 216 | 218 |
* Thu Oct 06 2022 Vamsi Krishna Brahmajosyula <vbrahmajosyula@vmware.com> 11.0.12-4 |
| ... | ... |
@@ -6,16 +6,20 @@ |
| 6 | 6 |
Summary: OpenJDK |
| 7 | 7 |
Name: openjdk11 |
| 8 | 8 |
Version: 11.0.12 |
| 9 |
-Release: 4%{?dist}
|
|
| 9 |
+Release: 5%{?dist}
|
|
| 10 | 10 |
License: GNU General Public License V2 |
| 11 | 11 |
URL: https://openjdk.java.net |
| 12 | 12 |
Group: Development/Tools |
| 13 | 13 |
Vendor: VMware, Inc. |
| 14 | 14 |
Distribution: Photon |
| 15 |
-Source0: http://www.java.net/download/openjdk/jdk/jdk11/openjdk-%{version}.tar.gz
|
|
| 15 |
+ |
|
| 16 |
+Source0: http://www.java.net/download/openjdk/jdk/jdk11/openjdk-%{version}.tar.gz
|
|
| 16 | 17 |
%define sha512 openjdk-11.0=1bc7878ccb73e495907c02718573b63c88f61581340e8038ab4f0abf6161ac355d7a1a420de4949192b7df951cd39a1d890f251cba4647d8fd425c72d92d0164 |
| 17 |
-Patch0: CVE-2022-34169.patch |
|
| 18 |
+ |
|
| 19 |
+Patch0: CVE-2022-34169.patch |
|
| 20 |
+ |
|
| 18 | 21 |
BuildArch: aarch64 |
| 22 |
+ |
|
| 19 | 23 |
BuildRequires: pcre-devel |
| 20 | 24 |
BuildRequires: which |
| 21 | 25 |
BuildRequires: zip |
| ... | ... |
@@ -24,10 +28,17 @@ BuildRequires: zlib-devel |
| 24 | 24 |
BuildRequires: ca-certificates |
| 25 | 25 |
BuildRequires: chkconfig |
| 26 | 26 |
BuildRequires: freetype2 |
| 27 |
-BuildRequires: fontconfig-devel freetype2-devel glib-devel harfbuzz-devel elfutils-libelf-devel |
|
| 27 |
+BuildRequires: fontconfig-devel |
|
| 28 |
+BuildRequires: freetype2-devel |
|
| 29 |
+BuildRequires: glib-devel |
|
| 30 |
+BuildRequires: harfbuzz-devel |
|
| 31 |
+BuildRequires: elfutils-libelf-devel |
|
| 32 |
+ |
|
| 28 | 33 |
Requires: chkconfig |
| 29 | 34 |
Obsoletes: openjdk <= %{version}
|
| 35 |
+ |
|
| 30 | 36 |
AutoReqProv: no |
| 37 |
+ |
|
| 31 | 38 |
%define ExtraBuildRequires icu-devel, cups, cups-devel, openjdk11, libXtst, libXtst-devel, libXi, libXi-devel, icu, alsa-lib, alsa-lib-devel, xcb-proto, libXdmcp-devel, libXau-devel, util-macros, xtrans, libxcb-devel, proto, libXdmcp, libxcb, libXau, xtrans-devel, libX11, libX11-devel, libXext, libXext-devel, libICE-devel, libSM, libICE, libSM-devel, libXt, libXmu, libXt-devel, libXmu-devel, libXrender, libXrender-devel, libXrandr, libXrandr-devel |
| 32 | 39 |
%define jdk_major_version 1.11.0 |
| 33 | 40 |
|
| ... | ... |
@@ -62,12 +73,12 @@ ENABLE_HEADLESS_ONLY="true" && |
| 62 | 62 |
--enable-headless-only \ |
| 63 | 63 |
--with-extra-cxxflags="-Wno-error -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse" \ |
| 64 | 64 |
--with-extra-cflags="-fno-delete-null-pointer-checks -Wno-error -fno-lifetime-dse" \ |
| 65 |
- --with-freetype-include=/usr/include/freetype2 \ |
|
| 66 |
- --with-freetype-lib=/usr/lib \ |
|
| 65 |
+ --with-freetype-include=%{_includedir}/freetype2 \
|
|
| 66 |
+ --with-freetype-lib=%{_libdir} \
|
|
| 67 | 67 |
--with-stdc++lib=dynamic \ |
| 68 | 68 |
--disable-warnings-as-errors |
| 69 | 69 |
|
| 70 |
-mkdir /usr/share/java -p |
|
| 70 |
+mkdir %{_datadir}/java -p
|
|
| 71 | 71 |
# make doesn't support _smp_mflags |
| 72 | 72 |
make \ |
| 73 | 73 |
DISABLE_HOTSPOT_OS_VERSION_CHECK=ok \ |
| ... | ... |
@@ -79,14 +90,14 @@ make \ |
| 79 | 79 |
LOG=trace |
| 80 | 80 |
|
| 81 | 81 |
%install |
| 82 |
-unset JAVA_HOME && |
|
| 82 |
+unset JAVA_HOME |
|
| 83 | 83 |
# make doesn't support _smp_mflags |
| 84 | 84 |
make install |
| 85 | 85 |
|
| 86 | 86 |
install -vdm755 %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}
|
| 87 | 87 |
chown -R root:root %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}
|
| 88 | 88 |
install -vdm755 %{buildroot}%{_bindir}
|
| 89 |
-mv /usr/local/jvm/openjdk-%{version}-internal/* %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/
|
|
| 89 |
+mv %{_usr}/local/jvm/openjdk-%{version}-internal/* %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/
|
|
| 90 | 90 |
cp README LICENSE ASSEMBLY_EXCEPTION %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/
|
| 91 | 91 |
|
| 92 | 92 |
%posttrans |
| ... | ... |
@@ -133,16 +144,15 @@ alternatives --install %{_bindir}/java java %{_libdir}/jvm/OpenJDK-%{jdk_major_v
|
| 133 | 133 |
|
| 134 | 134 |
%postun |
| 135 | 135 |
# Do alternative remove only in case of uninstall |
| 136 |
-if [ $1 -eq 0 ] |
|
| 137 |
-then |
|
| 136 |
+if [ $1 -eq 0 ]; then |
|
| 138 | 137 |
alternatives --remove javac %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/javac
|
| 139 | 138 |
alternatives --remove java %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/java
|
| 140 | 139 |
fi |
| 141 | 140 |
/sbin/ldconfig |
| 142 | 141 |
|
| 143 | 142 |
%clean |
| 144 |
-rm -rf %{buildroot}/*
|
|
| 145 |
-rm -rf %{_libdir}/jvm/OpenJDK-*
|
|
| 143 |
+rm -rf %{buildroot}/* \
|
|
| 144 |
+ %{_libdir}/jvm/OpenJDK-*
|
|
| 146 | 145 |
|
| 147 | 146 |
%files |
| 148 | 147 |
%defattr(-,root,root) |
| ... | ... |
@@ -200,6 +210,8 @@ rm -rf %{_libdir}/jvm/OpenJDK-*
|
| 200 | 200 |
%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/lib/src.zip
|
| 201 | 201 |
|
| 202 | 202 |
%changelog |
| 203 |
+* Sat Feb 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 11.0.12-5 |
|
| 204 |
+- Bump version as a part of icu upgrade |
|
| 203 | 205 |
* Fri Jan 06 2023 Vamsi Krishna Brahmajosyula <vbrahmajosyula@vmware.com> 11.0.12-4 |
| 204 | 206 |
- Bump up due to change in elfutils |
| 205 | 207 |
* Tue Sep 20 2022 Vamsi Krishna Brahmajosyula <vbrahmajosyula@vmware.com> 11.0.12-3 |
| ... | ... |
@@ -5,7 +5,7 @@ |
| 5 | 5 |
Summary: OpenJDK |
| 6 | 6 |
Name: openjdk17 |
| 7 | 7 |
Version: 17.0.5 |
| 8 |
-Release: 2%{?dist}
|
|
| 8 |
+Release: 3%{?dist}
|
|
| 9 | 9 |
License: GNU General Public License V2 |
| 10 | 10 |
URL: https://openjdk.java.net |
| 11 | 11 |
Group: Development/Tools |
| ... | ... |
@@ -60,8 +60,9 @@ This package provides the runtime library class sources. |
| 60 | 60 |
|
| 61 | 61 |
%build |
| 62 | 62 |
chmod a+x ./configur* |
| 63 |
-unset JAVA_HOME && |
|
| 64 |
-ENABLE_HEADLESS_ONLY="true" && |
|
| 63 |
+unset JAVA_HOME |
|
| 64 |
+ENABLE_HEADLESS_ONLY="true" |
|
| 65 |
+ |
|
| 65 | 66 |
sh ./configur* \ |
| 66 | 67 |
--with-target-bits=64 \ |
| 67 | 68 |
--enable-headless-only \ |
| ... | ... |
@@ -91,7 +92,7 @@ make install |
| 91 | 91 |
install -vdm755 %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}
|
| 92 | 92 |
chown -R root:root %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}
|
| 93 | 93 |
install -vdm755 %{buildroot}%{_bindir}
|
| 94 |
-mv /usr/local/jvm/openjdk-%{version}-internal/* %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/
|
|
| 94 |
+mv %{_usr}/local/jvm/openjdk-%{version}-internal/* %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/
|
|
| 95 | 95 |
cp README.md LICENSE ASSEMBLY_EXCEPTION %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/
|
| 96 | 96 |
|
| 97 | 97 |
%post |
| ... | ... |
@@ -199,6 +200,8 @@ rm -rf %{buildroot}/* %{_libdir}/jvm/OpenJDK-*
|
| 199 | 199 |
%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/lib/src.zip
|
| 200 | 200 |
|
| 201 | 201 |
%changelog |
| 202 |
+* Sat Feb 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 17.0.5-3 |
|
| 203 |
+- Bump version as a part of icu upgrade |
|
| 202 | 204 |
* Fri Jan 06 2023 Vamsi Krishna Brahmajosyula <vbrahmajosyula@vmware.com> 17.0.5-2 |
| 203 | 205 |
- Bump up due to change in elfutils |
| 204 | 206 |
* Fri Oct 28 2022 Vamsi Krishna Brahmajosyula <vbrahmajosyula@vmware.com> 17.0.5-1 |
| ... | ... |
@@ -5,14 +5,16 @@ |
| 5 | 5 |
Summary: OpenJDK |
| 6 | 6 |
Name: openjdk17 |
| 7 | 7 |
Version: 17.0.5 |
| 8 |
-Release: 2%{?dist}
|
|
| 8 |
+Release: 3%{?dist}
|
|
| 9 | 9 |
License: GNU General Public License V2 |
| 10 | 10 |
URL: https://openjdk.java.net |
| 11 | 11 |
Group: Development/Tools |
| 12 | 12 |
Vendor: VMware, Inc. |
| 13 | 13 |
Distribution: Photon |
| 14 |
-Source0: http://www.java.net/download/openjdk/jdk/jdk17/openjdk-%{version}.tar.gz
|
|
| 14 |
+ |
|
| 15 |
+Source0: http://www.java.net/download/openjdk/jdk/jdk17/openjdk-%{version}.tar.gz
|
|
| 15 | 16 |
%define sha512 openjdk-17.0=9521a700f2f850109fb7069ac892767764081a4215b1ed09e8c783a73835bab7f1f24969e228dba9313f373529a194281d9dd648345ff808b11b74fba5c9f4a7 |
| 17 |
+ |
|
| 16 | 18 |
BuildArch: aarch64 |
| 17 | 19 |
BuildRequires: pcre-devel |
| 18 | 20 |
BuildRequires: which |
| ... | ... |
@@ -22,10 +24,17 @@ BuildRequires: zlib-devel |
| 22 | 22 |
BuildRequires: ca-certificates |
| 23 | 23 |
BuildRequires: chkconfig |
| 24 | 24 |
BuildRequires: freetype2 |
| 25 |
-BuildRequires: fontconfig-devel freetype2-devel glib-devel harfbuzz-devel elfutils-libelf-devel |
|
| 25 |
+BuildRequires: fontconfig-devel |
|
| 26 |
+BuildRequires: freetype2-devel |
|
| 27 |
+BuildRequires: glib-devel |
|
| 28 |
+BuildRequires: harfbuzz-devel |
|
| 29 |
+BuildRequires: elfutils-libelf-devel |
|
| 30 |
+ |
|
| 26 | 31 |
Requires: chkconfig |
| 27 | 32 |
Requires: libstdc++ |
| 33 |
+ |
|
| 28 | 34 |
AutoReqProv: no |
| 35 |
+ |
|
| 29 | 36 |
%define ExtraBuildRequires icu-devel, cups, cups-devel, openjdk17, libXtst, libXtst-devel, libXi, libXi-devel, icu, alsa-lib, alsa-lib-devel, xcb-proto, libXdmcp-devel, libXau-devel, util-macros, xtrans, libxcb-devel, proto, libXdmcp, libxcb, libXau, xtrans-devel, libX11, libX11-devel, libXext, libXext-devel, libICE-devel, libSM, libICE, libSM-devel, libXt, libXmu, libXt-devel, libXmu-devel, libXrender, libXrender-devel, libXrandr, libXrandr-devel |
| 30 | 37 |
|
| 31 | 38 |
%description |
| ... | ... |
@@ -50,19 +59,20 @@ This package provides the runtime library class sources. |
| 50 | 50 |
|
| 51 | 51 |
%build |
| 52 | 52 |
chmod a+x ./configur* |
| 53 |
-unset JAVA_HOME && |
|
| 54 |
-ENABLE_HEADLESS_ONLY="true" && |
|
| 53 |
+unset JAVA_HOME |
|
| 54 |
+ENABLE_HEADLESS_ONLY="true" |
|
| 55 |
+ |
|
| 55 | 56 |
./configur* \ |
| 56 | 57 |
--with-target-bits=64 \ |
| 57 | 58 |
--enable-headless-only \ |
| 58 | 59 |
--with-extra-cxxflags="-Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse" \ |
| 59 | 60 |
--with-extra-cflags="-fno-delete-null-pointer-checks -Wno-error -fno-lifetime-dse" \ |
| 60 |
- --with-freetype-include=/usr/include/freetype2 \ |
|
| 61 |
- --with-freetype-lib=/usr/lib \ |
|
| 61 |
+ --with-freetype-include=%{_includedir}/freetype2 \
|
|
| 62 |
+ --with-freetype-lib=%{_libdir} \
|
|
| 62 | 63 |
--with-stdc++lib=dynamic \ |
| 63 | 64 |
--disable-warnings-as-errors |
| 64 | 65 |
|
| 65 |
-mkdir /usr/share/java -p |
|
| 66 |
+mkdir %{_datadir}/java -p
|
|
| 66 | 67 |
# make doesn't support _smp_mflags |
| 67 | 68 |
make \ |
| 68 | 69 |
DISABLE_HOTSPOT_OS_VERSION_CHECK=ok \ |
| ... | ... |
@@ -74,14 +84,14 @@ make \ |
| 74 | 74 |
LOG=trace |
| 75 | 75 |
|
| 76 | 76 |
%install |
| 77 |
-unset JAVA_HOME && |
|
| 77 |
+unset JAVA_HOME |
|
| 78 | 78 |
# make doesn't support _smp_mflags |
| 79 | 79 |
make install |
| 80 | 80 |
|
| 81 | 81 |
install -vdm755 %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}
|
| 82 | 82 |
chown -R root:root %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}
|
| 83 | 83 |
install -vdm755 %{buildroot}%{_bindir}
|
| 84 |
-mv /usr/local/jvm/openjdk-%{version}-internal/* %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/
|
|
| 84 |
+mv %{_usr}/local/jvm/openjdk-%{version}-internal/* %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/
|
|
| 85 | 85 |
cp README.md LICENSE ASSEMBLY_EXCEPTION %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/
|
| 86 | 86 |
|
| 87 | 87 |
%posttrans |
| ... | ... |
@@ -128,16 +138,15 @@ alternatives --install %{_bindir}/java java %{_libdir}/jvm/OpenJDK-%{jdk_major_v
|
| 128 | 128 |
|
| 129 | 129 |
%postun |
| 130 | 130 |
# Do alternative remove only in case of uninstall |
| 131 |
-if [ $1 -eq 0 ] |
|
| 132 |
-then |
|
| 131 |
+if [ $1 -eq 0 ]; then |
|
| 133 | 132 |
alternatives --remove javac %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/javac
|
| 134 | 133 |
alternatives --remove java %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/java
|
| 135 | 134 |
fi |
| 136 | 135 |
/sbin/ldconfig |
| 137 | 136 |
|
| 138 | 137 |
%clean |
| 139 |
-rm -rf %{buildroot}/*
|
|
| 140 |
-rm -rf %{_libdir}/jvm/OpenJDK-*
|
|
| 138 |
+rm -rf %{buildroot}/* \
|
|
| 139 |
+ %{_libdir}/jvm/OpenJDK-*
|
|
| 141 | 140 |
|
| 142 | 141 |
%files |
| 143 | 142 |
%defattr(-,root,root) |
| ... | ... |
@@ -190,6 +199,8 @@ rm -rf %{_libdir}/jvm/OpenJDK-*
|
| 190 | 190 |
%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/lib/src.zip
|
| 191 | 191 |
|
| 192 | 192 |
%changelog |
| 193 |
+* Sat Feb 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 17.0.5-3 |
|
| 194 |
+- Bump version as a part of icu upgrade |
|
| 193 | 195 |
* Fri Jan 06 2023 Vamsi Krishna Brahmajosyula <vbrahmajosyula@vmware.com> 17.0.5-2 |
| 194 | 196 |
- Bump up due to change in elfutils |
| 195 | 197 |
* Fri Oct 28 2022 Vamsi Krishna Brahmajosyula <vbrahmajosyula@vmware.com> 17.0.5-1 |
| ... | ... |
@@ -12,7 +12,7 @@ |
| 12 | 12 |
Summary: PostgreSQL database engine |
| 13 | 13 |
Name: postgresql13 |
| 14 | 14 |
Version: 13.8 |
| 15 |
-Release: 12%{?dist}
|
|
| 15 |
+Release: 13%{?dist}
|
|
| 16 | 16 |
License: PostgreSQL |
| 17 | 17 |
URL: www.postgresql.org |
| 18 | 18 |
Group: Applications/Databases |
| ... | ... |
@@ -644,6 +644,8 @@ rm -rf %{buildroot}/*
|
| 644 | 644 |
%{_pglibdir}/plpython3.so
|
| 645 | 645 |
|
| 646 | 646 |
%changelog |
| 647 |
+* Sun Feb 12 2023 Shreenidhi Shedi <sshedi@vmware.com> 13.8-13 |
|
| 648 |
+- Bump version as a part of icu upgrade |
|
| 647 | 649 |
* Fri Feb 10 2023 Shreenidhi Shedi <sshedi@vmware.com> 13.8-12 |
| 648 | 650 |
- Bump version as a part of openldap upgrade |
| 649 | 651 |
* Thu Feb 09 2023 Shreenidhi Shedi <sshedi@vmware.com> 13.8-11 |
| ... | ... |
@@ -12,7 +12,7 @@ |
| 12 | 12 |
Summary: PostgreSQL database engine |
| 13 | 13 |
Name: postgresql14 |
| 14 | 14 |
Version: 14.5 |
| 15 |
-Release: 12%{?dist}
|
|
| 15 |
+Release: 13%{?dist}
|
|
| 16 | 16 |
License: PostgreSQL |
| 17 | 17 |
URL: www.postgresql.org |
| 18 | 18 |
Group: Applications/Databases |
| ... | ... |
@@ -660,6 +660,8 @@ rm -rf %{buildroot}/*
|
| 660 | 660 |
%{_pglibdir}/plpython3.so
|
| 661 | 661 |
|
| 662 | 662 |
%changelog |
| 663 |
+* Sun Feb 12 2023 Shreenidhi Shedi <sshedi@vmware.com> 14.5-13 |
|
| 664 |
+- Bump version as a part of icu upgrade |
|
| 663 | 665 |
* Fri Feb 10 2023 Shreenidhi Shedi <sshedi@vmware.com> 14.5-12 |
| 664 | 666 |
- Bump version as a part of openldap upgrade |
| 665 | 667 |
* Thu Feb 09 2023 Shreenidhi Shedi <sshedi@vmware.com> 14.5-11 |
| ... | ... |
@@ -12,7 +12,7 @@ |
| 12 | 12 |
Summary: PostgreSQL database engine |
| 13 | 13 |
Name: postgresql15 |
| 14 | 14 |
Version: 15.1 |
| 15 |
-Release: 4%{?dist}
|
|
| 15 |
+Release: 5%{?dist}
|
|
| 16 | 16 |
License: PostgreSQL |
| 17 | 17 |
URL: www.postgresql.org |
| 18 | 18 |
Group: Applications/Databases |
| ... | ... |
@@ -663,6 +663,8 @@ rm -rf %{buildroot}/*
|
| 663 | 663 |
%{_pglibdir}/plpython3.so
|
| 664 | 664 |
|
| 665 | 665 |
%changelog |
| 666 |
+* Sun Feb 12 2023 Shreenidhi Shedi <sshedi@vmware.com> 15.1-5 |
|
| 667 |
+- Bump version as a part of icu upgrade |
|
| 666 | 668 |
* Fri Feb 10 2023 Shreenidhi Shedi <sshedi@vmware.com> 15.1-4 |
| 667 | 669 |
- Bump version as a part of openldap upgrade |
| 668 | 670 |
* Thu Feb 09 2023 Shreenidhi Shedi <sshedi@vmware.com> 15.1-3 |