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-19 23:14:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'rosa2019.1' of https://abf.rosalinux.ru/import/java-1.8.0-openjdk into rosa2019.1

Browse source
This commit is contained in:
Denis Silakov 2019-11-17 18:59:21 +03:00
commit 8872b58607
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

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

4
jconsole.desktop.in
View file

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

5
policytool.desktop.in
View file

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