diff --git a/jdk-updates-jdk11u-jdk-11.0.19-ga.tar.gz b/jdk-updates-jdk11u-jdk-11.0.19-ga.tar.gz deleted file mode 100644 index 360f3a82edd09a7f20ac98f878f2b1bdd6566009..0000000000000000000000000000000000000000 Binary files a/jdk-updates-jdk11u-jdk-11.0.19-ga.tar.gz and /dev/null differ diff --git a/openjdk-11.spec b/openjdk-11.spec index 4a92a09d4a182003f2423b16953bb974bc0b5c31..f4040334ca46fb2b0f65235b5d6c9417395ea89e 100644 --- a/openjdk-11.spec +++ b/openjdk-11.spec @@ -748,7 +748,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 1 +Release: 2 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -1293,10 +1293,6 @@ bash ../configure \ --with-libpng=system \ --with-lcms=system \ --with-harfbuzz=system \ - --with-stdc++lib=dynamic \ - --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \ - --with-extra-cflags="$EXTRA_CFLAGS" \ - --with-extra-ldflags="%{ourldflags}" \ --with-num-cores="$NUM_PROC" \ --disable-javac-server \ --disable-warnings-as-errors \ @@ -1508,13 +1504,13 @@ cp -r %{top_level_dir_name}/src/sample $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $ # moving config files to /etc mkdir -p $RPM_BUILD_ROOT/%{etcjavadir -- $suffix} mkdir -p $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}/lib -mv $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/conf/ $RPM_BUILD_ROOT/%{etcjavadir -- $suffix} -mv $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/lib/security $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}/lib +cp -r $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/conf/ $RPM_BUILD_ROOT/%{etcjavadir -- $suffix} +cp -r $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/lib/security $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}/lib pushd $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix} - ln -s %{etcjavadir -- $suffix}/conf ./conf +# ln -s %{etcjavadir -- $suffix}/conf ./conf popd pushd $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/lib - ln -s %{etcjavadir -- $suffix}/lib/security ./security +# ln -s %{etcjavadir -- $suffix}/lib/security ./security popd # end moving files to /etc