Djam/java-1.8.0-openjdk
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/java-1.8.0-openjdk.git synced 2025-04-22 12:44:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not use --family in update_alternatives - we don't have it yet

Browse source
This commit is contained in:
Denis Silakov 2016-09-28 11:12:36 +03:00
parent d5cb647556
commit 049ec9aa16
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
java-1.8.0-openjdk.spec
View file

@ -264,7 +264,7 @@ fi
ext=%{_extension} ext=%{_extension}
alternatives \\ alternatives \\
--install %{_bindir}/java java %{jrebindir %%1}/java $PRIORITY --family %{name}.%{_arch} \\ --install %{_bindir}/java java %{jrebindir %%1}/java $PRIORITY \\
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{jredir %%1} \\ --slave %{_jvmdir}/jre jre %{_jvmdir}/%{jredir %%1} \\
--slave %{_jvmjardir}/jre jre_exports %{_jvmjardir}/%{jrelnk %%1} \\ --slave %{_jvmjardir}/jre jre_exports %{_jvmjardir}/%{jrelnk %%1} \\
--slave %{_bindir}/jjs jjs %{jrebindir %%1}/jjs \\ --slave %{_bindir}/jjs jjs %{jrebindir %%1}/jjs \\
@ -303,12 +303,12 @@ alternatives \\
for X in %{origin} %{javaver} ; do for X in %{origin} %{javaver} ; do
alternatives \\ alternatives \\
--install %{_jvmdir}/jre-"$X" \\ --install %{_jvmdir}/jre-"$X" \\
jre_"$X" %{_jvmdir}/%{jredir %%1} $PRIORITY --family %{name}.%{_arch} \\ jre_"$X" %{_jvmdir}/%{jredir %%1} $PRIORITY \\
--slave %{_jvmjardir}/jre-"$X" \\ --slave %{_jvmjardir}/jre-"$X" \\
jre_"$X"_exports %{_jvmdir}/%{jredir %%1} jre_"$X"_exports %{_jvmdir}/%{jredir %%1}
done done
update-alternatives --install %{_jvmdir}/jre-%{javaver}-%{origin} jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk %%1} $PRIORITY --family %{name}.%{_arch} \\ update-alternatives --install %{_jvmdir}/jre-%{javaver}-%{origin} jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk %%1} $PRIORITY \\
--slave %{_jvmjardir}/jre-%{javaver} jre_%{javaver}_%{origin}_exports %{jvmjardir %%1} --slave %{_jvmjardir}/jre-%{javaver} jre_%{javaver}_%{origin}_exports %{jvmjardir %%1}
update-desktop-database %{_datadir}/applications &> /dev/null || : update-desktop-database %{_datadir}/applications &> /dev/null || :
@ -346,7 +346,7 @@ fi
ext=%{_extension} ext=%{_extension}
alternatives \\ alternatives \\
--install %{_bindir}/javac javac %{sdkbindir %%1}/javac $PRIORITY --family %{name}.%{_arch} \\ --install %{_bindir}/javac javac %{sdkbindir %%1}/javac $PRIORITY \\
--slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdkdir %%1} \\ --slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdkdir %%1} \\
--slave %{_jvmjardir}/java java_sdk_exports %{_jvmjardir}/%{sdkdir %%1} \\ --slave %{_jvmjardir}/java java_sdk_exports %{_jvmjardir}/%{sdkdir %%1} \\
--slave %{_bindir}/appletviewer appletviewer %{sdkbindir %%1}/appletviewer \\ --slave %{_bindir}/appletviewer appletviewer %{sdkbindir %%1}/appletviewer \\
@ -439,12 +439,12 @@ alternatives \\
for X in %{origin} %{javaver} ; do for X in %{origin} %{javaver} ; do
alternatives \\ alternatives \\
--install %{_jvmdir}/java-"$X" \\ --install %{_jvmdir}/java-"$X" \\
java_sdk_"$X" %{_jvmdir}/%{sdkdir %%1} $PRIORITY --family %{name}.%{_arch} \\ java_sdk_"$X" %{_jvmdir}/%{sdkdir %%1} $PRIORITY \\
--slave %{_jvmjardir}/java-"$X" \\ --slave %{_jvmjardir}/java-"$X" \\
java_sdk_"$X"_exports %{_jvmjardir}/%{sdkdir %%1} java_sdk_"$X"_exports %{_jvmjardir}/%{sdkdir %%1}
done done
update-alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} java_sdk_%{javaver}_%{origin} %{_jvmdir}/%{sdkdir %%1} $PRIORITY --family %{name}.%{_arch} \\ update-alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} java_sdk_%{javaver}_%{origin} %{_jvmdir}/%{sdkdir %%1} $PRIORITY \\
--slave %{_jvmjardir}/java-%{javaver}-%{origin} java_sdk_%{javaver}_%{origin}_exports %{_jvmjardir}/%{sdkdir %%1} --slave %{_jvmjardir}/java-%{javaver}-%{origin} java_sdk_%{javaver}_%{origin}_exports %{_jvmjardir}/%{sdkdir %%1}
update-desktop-database %{_datadir}/applications &> /dev/null || : update-desktop-database %{_datadir}/applications &> /dev/null || :
@ -481,7 +481,7 @@ fi
alternatives \\ alternatives \\
--install %{_javadocdir}/java javadocdir %{_javadocdir}/%{uniquejavadocdir %%1}/api \\ --install %{_javadocdir}/java javadocdir %{_javadocdir}/%{uniquejavadocdir %%1}/api \\
$PRIORITY --family %{name} $PRIORITY
exit 0 exit 0
} }
@ -499,7 +499,7 @@ fi
alternatives \\ alternatives \\
--install %{_javadocdir}/java-zip javadoczip %{_javadocdir}/%{uniquejavadocdir %%1}.zip \\ --install %{_javadocdir}/java-zip javadoczip %{_javadocdir}/%{uniquejavadocdir %%1}.zip \\
$PRIORITY --family %{name} $PRIORITY
exit 0 exit 0
} }
@ -756,7 +756,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%1
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever} Version: %{javaver}.%{updatever}
Release: 1.%{buildver}.1 Release: 1.%{buildver}.2
# 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