rpms/java-1.8.0-openjdk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix paths in tapsets to work on x86_64

Browse Source
This commit is contained in:
Omair Majid 2013-10-06 13:46:24 -04:00
parent 0a505a76dc
commit 3f612fdffc
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
java-1.8.0-openjdk.spec
View File

@ -125,7 +125,7 @@
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver} Version: %{javaver}.%{buildver}
Release: 0.19.%{jdk8_version}%{?dist} Release: 0.20.%{jdk8_version}%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # 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 # 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 # also included the epoch in their virtual provides. This created a
@ -383,8 +383,13 @@ tar xzf %{SOURCE8}
for file in tapset/*.in; do for file in tapset/*.in; do
OUTPUT_FILE=`echo $file | sed -e s:\.in$::g` OUTPUT_FILE=`echo $file | sed -e s:\.in$::g`
sed -e s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir}/jre/lib/amd64/server/libjvm.so:g $file > $OUTPUT_FILE sed -e s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/libjvm.so:g $file > $file.1
sed -i -e '/@ABS_CLIENT_LIBJVM_SO@/d' $OUTPUT_FILE # TODO find out which architectures other than ix86 have a client vm
%ifarch %{ix86}
sed -e s:@ABS_CLIENT_LIBJVM_SO@:%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client/libjvm.so:g $file.1 > $OUTPUT_FILE
%else
sed -e '/@ABS_CLIENT_LIBJVM_SO@/d' $file.1 > $OUTPUT_FILE
%endif
sed -i -e s:@ABS_JAVA_HOME_DIR@:%{_jvmdir}/%{sdkdir}:g $OUTPUT_FILE sed -i -e s:@ABS_JAVA_HOME_DIR@:%{_jvmdir}/%{sdkdir}:g $OUTPUT_FILE
sed -i -e s:@INSTALL_ARCH_DIR@:%{archinstall}:g $OUTPUT_FILE sed -i -e s:@INSTALL_ARCH_DIR@:%{archinstall}:g $OUTPUT_FILE
@ -915,6 +920,9 @@ exit 0
%doc %{buildoutputdir}/images/j2sdk-image/jre/LICENSE %doc %{buildoutputdir}/images/j2sdk-image/jre/LICENSE
%changelog %changelog
* Sun Oct 06 2013 Omair Majid <omajid@redhat.com - 1:1.8.0.0-0.20.b106
- Fix paths in tapsets to work on non-x86_64
* Thu Sep 05 2013 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.19.b106 * Thu Sep 05 2013 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.19.b106
- Fix with_systemtap conditionals - Fix with_systemtap conditionals