From 50c9fba8367ab5798241438c636dd978b1ca6ae6 Mon Sep 17 00:00:00 2001
From: Andrey Bondrov <andrey.bondrov@rosalab.ru>
Date: Fri, 15 Nov 2019 09:17:48 +1000
Subject: [PATCH] Don't include full version, release and build arch in
 .desktop files

---
 java-1.8.0-openjdk.spec | 13 +++++--------
 jconsole.desktop.in     |  4 ++--
 policytool.desktop.in   |  5 +++--
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 1a3f041..f129aaf 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -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
diff --git a/jconsole.desktop.in b/jconsole.desktop.in
index a096349..826c77c 100644
--- a/jconsole.desktop.in
+++ b/jconsole.desktop.in
@@ -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
diff --git a/policytool.desktop.in b/policytool.desktop.in
index d38b42d..e6ec33b 100644
--- a/policytool.desktop.in
+++ b/policytool.desktop.in
@@ -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