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-11 11:04:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't include full version, release and build arch in .desktop files

Browse source
This commit is contained in:
Andrey Bondrov 2019-11-15 09:17:48 +10:00
parent d74086d09a
commit 50c9fba836
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
java-1.8.0-openjdk.spec
View file

@ -552,7 +552,7 @@ exit 0
%define files_jre() %{expand:
%{_datadir}/icons/hicolor/*x*/apps/java-%{javaver}.png
%{_datadir}/applications/*policytool%{?1}.desktop
%{_datadir}/applications/*policytool-%{javaver}%{?1}.desktop
%{_jvmdir}/%{sdkdir %{?1}}/jre/lib/%{archinstall}/libjsoundalsa.so
%{_jvmdir}/%{sdkdir %{?1}}/jre/lib/%{archinstall}/libsplashscreen.so
%{_jvmdir}/%{sdkdir %{?1}}/jre/lib/%{archinstall}/libawt_xawt.so
@ -699,7 +699,7 @@ exit 0
%{_jvmdir}/%{sdkdir %%1}/include/*
%{_jvmdir}/%{sdkdir %%1}/lib/*
#%{_jvmjardir}/%{sdkdir %%1}
%{_datadir}/applications/*jconsole%1.desktop
%{_datadir}/applications/*jconsole-%{javaver}%1.desktop
%{_mandir}/man1/appletviewer-%{uniquesuffix %%1}.1*
%{_mandir}/man1/extcheck-%{uniquesuffix %%1}.1*
%{_mandir}/man1/idlj-%{uniquesuffix %%1}.1*
@ -891,7 +891,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%{?1} < %{EVRD}
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}
Release: 1.%{buildver}.6
Release: 1.%{buildver}.8
# 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
@ -1125,10 +1125,9 @@ BuildRequires: automake
BuildRequires: pkgconfig(alsa)
BuildRequires: binutils
BuildRequires: cups-devel
BuildRequires: desktop-file-utils
BuildRequires: elfutils
BuildRequires: fontconfig
BuildRequires: freetype-devel
BuildRequires: freetype2-devel
BuildRequires: giflib-devel
BuildRequires: gcc-c++
BuildRequires: gdb
@ -1573,7 +1572,6 @@ for file in %{SOURCE9} %{SOURCE10} ; do
OUTPUT_FILE=$NAME$suffix.$EXT
sed -e s:#JAVA_HOME#:%{sdkbindir $suffix}:g $file > $OUTPUT_FILE
sed -i -e s:#JRE_HOME#:%{jrebindir $suffix}:g $OUTPUT_FILE
sed -i -e s:#ARCH#:%{version}-%{release}.%{_arch}$suffix:g $OUTPUT_FILE
done
done
@ -1904,8 +1902,7 @@ done
# Install desktop files.
install -d -m 755 %{buildroot}%{_datadir}/{applications,pixmaps}
for e in jconsole$suffix policytool$suffix ; do
desktop-file-install --vendor=%{uniquesuffix $suffix} --mode=644 \
--dir=%{buildroot}%{_datadir}/applications $e.desktop
install -m 644 $e.desktop %{buildroot}%{_datadir}/applications/$e-%{javaver}.desktop
done
# Install /etc/.java/.systemPrefs/ directory

4
jconsole.desktop.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
Name=OpenJDK 8 Monitoring & Management Console #ARCH#
Comment=Monitor and manage OpenJDK applications for #ARCH#
Name=OpenJDK 8 Monitoring & Management Console
Comment=Monitor and manage OpenJDK applications
Exec=#JAVA_HOME#/jconsole
Icon=java-1.8.0
Terminal=false

5
policytool.desktop.in
View file

@ -1,6 +1,7 @@
[Desktop Entry]
Name=OpenJDK 8 Policy Tool #ARCH#
Comment=Manage OpenJDK policy files #ARCH#
Name=OpenJDK 8 Policy Tool
Comment=Manage OpenJDK policy files
Comment[ru]=Управление файлами политик OpenJDK
Exec=#JRE_HOME#/policytool
Icon=java-1.8.0
Terminal=false