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

Include version information in desktop files

Browse Source 
Move desktop files from tarball to top level source
This commit is contained in:
Omair Majid 2014-03-27 17:09:04 -04:00
parent 9d015e7b3c
commit 0ccb6d06e9
4 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
generate_tarballs.sh
View File

@ -9,8 +9,8 @@ rm -f icedtea7.tar.gz
pushd icedtea7-${VERSION} pushd icedtea7-${VERSION}
# desktop files # desktop files
tar cvzf desktop-files.tar.gz jconsole.desktop policytool.desktop mv jconsole.desktop ../jconsole.desktop.in
mv desktop-files.tar.gz ../ mv policytool.desktop ../policytool.desktop.in
# tapsets # tapsets
mv tapset/hotspot{,-1.8.0}.stp.in || exit 1 mv tapset/hotspot{,-1.8.0}.stp.in || exit 1

24
java-1.8.0-openjdk.spec
View File

@ -130,7 +130,7 @@
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever} Version: %{javaver}.%{updatever}
Release: 1.0.%{buildver}%{?dist} Release: 2.%{buildver}%{?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
@ -163,11 +163,13 @@ Source3: java-abrt-launcher.in
# Systemtap tapsets. Zipped up to keep it small. # Systemtap tapsets. Zipped up to keep it small.
Source8: systemtap-tapset.tar.gz Source8: systemtap-tapset.tar.gz
# .desktop files. Zipped up to keep it small.
Source9: desktop-files.tar.gz # Desktop files. Adapated from IcedTea.
Source9: jconsole.desktop.in
Source10: policytool.desktop.in
# nss configuration file # nss configuration file
Source10: nss.cfg Source11: nss.cfg
# Removed libraries that we link instead # Removed libraries that we link instead
Source12: remove-intree-libraries.sh Source12: remove-intree-libraries.sh
@ -460,8 +462,12 @@ done
%endif %endif
# Extract desktop files # Prepare desktop files
tar xzf %{SOURCE9} for file in %{SOURCE9} %{SOURCE10} ; do
OUTPUT_FILE=`basename $file | sed -e s:\.in$::g`
sed -e s:@JAVA_HOME@:%{_jvmdir}/%{sdkdir}:g $file > $OUTPUT_FILE
sed -i -e s:@VERSION@:%{version}-%{release}.%{_arch}:g $OUTPUT_FILE
done
%build %build
# How many cpu's do we have? # How many cpu's do we have?
@ -651,7 +657,7 @@ popd
# Install nss.cfg # Install nss.cfg
install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security/ install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security/
# Install Javadoc documentation. # Install Javadoc documentation.
@ -1091,6 +1097,10 @@ exit 0
%{_jvmdir}/%{jredir}/lib/accessibility.properties %{_jvmdir}/%{jredir}/lib/accessibility.properties
%changelog %changelog
* Fri Mar 28 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-2.b132
- Include version information in desktop files
- Move desktop files from tarball to top level source
* Tue Mar 25 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-1.0.b132 * Tue Mar 25 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-1.0.b132
- Switch from java8- style provides to java- style - Switch from java8- style provides to java- style
- Bump priority to reflect java version - Bump priority to reflect java version

10
jconsole.desktop.in Normal file
View File

@ -0,0 +1,10 @@
[Desktop Entry]
Name=OpenJDK 8 Monitoring & Management Console
Comment=Monitor and manage OpenJDK applications for @VERSION@
Exec=@JAVA_HOME@/bin/jconsole
Icon=java
Terminal=false
Type=Application
StartupWMClass=sun-tools-jconsole-JConsole
Categories=Development;Monitor;Java;
Version=1.0

10
policytool.desktop.in Normal file
View File

@ -0,0 +1,10 @@
[Desktop Entry]
Name=OpenJDK 8 Policy Tool
Comment=Manage OpenJDK policy files (@VERSION@)
Exec=@JAVA_HOME@/bin/policytool
Icon=java
Terminal=false
Type=Application
StartupWMClass=sun-security-tools-PolicyTool
Categories=Development;Java;
Version=1.0