Attachment 282361 Details for Bug 417501 – Add jconsole, policytool menu entries, fix scriptlet exit statuses

[patch] Add jconsole, policytool menu entries, fix scriptlet exit statuses

icedtea.patch (text/plain), 5.01 KB, created by Ville Skyttä on 2007-12-09 21:20:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2007-12-09 21:20:41 UTC

Size: 5.01 KB

patch

obsolete

>Index: java-1.7.0-icedtea-jconsole.desktop
>===================================================================
>RCS file: java-1.7.0-icedtea-jconsole.desktop
>diff -N java-1.7.0-icedtea-jconsole.desktop
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ java-1.7.0-icedtea-jconsole.desktop	9 Dec 2007 21:17:18 -0000
>@@ -0,0 +1,11 @@
>+[Desktop Entry]
>+Name=Java Monitoring & Management Console
>+Comment=Monitor and manage Java applications
>+Exec=jconsole
>+TryExec=jconsole
>+Icon=java
>+Terminal=false
>+Type=Application
>+StartupWMClass=sun-tools-jconsole-JConsole
>+Categories=Development;Monitor;Java;
>+Version=1.0
>Index: java-1.7.0-icedtea-policytool.desktop
>===================================================================
>RCS file: java-1.7.0-icedtea-policytool.desktop
>diff -N java-1.7.0-icedtea-policytool.desktop
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ java-1.7.0-icedtea-policytool.desktop	9 Dec 2007 21:17:19 -0000
>@@ -0,0 +1,11 @@
>+[Desktop Entry]
>+Name=Java Policy Tool
>+Comment=Manage Java policy files
>+Exec=policytool
>+TryExec=policytool
>+Icon=java
>+Terminal=false
>+Type=Application
>+StartupWMClass=sun-security-tools-PolicyTool
>+Categories=Development;Java;
>+Version=1.0
>Index: java-1.7.0-icedtea.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
>retrieving revision 1.34
>diff -u -r1.34 java-1.7.0-icedtea.spec
>--- java-1.7.0-icedtea.spec	7 Dec 2007 02:41:58 -0000	1.34
>+++ java-1.7.0-icedtea.spec	9 Dec 2007 21:17:19 -0000
>@@ -122,6 +122,8 @@
> Source5:  README.plugin
> Source6:  mauve-%{mauvedate}.tar.gz
> Source7:  mauve_tests
>+Source8:  %{name}-jconsole.desktop
>+Source9:  %{name}-policytool.desktop
> Patch0:   java-1.7.0-icedtea-makefile.patch
> Patch1:   java-1.7.0-icedtea-win32.patch
> Patch2:   java-1.7.0-icedtea-jhat.patch
>@@ -130,6 +132,7 @@
> 
> BuildRequires: alsa-lib-devel
> BuildRequires: cups-devel
>+BuildRequires: desktop-file-utils
> BuildRequires: giflib-devel
> BuildRequires: lesstif-devel
> BuildRequires: libX11-devel
>@@ -283,6 +286,8 @@
> cp %{SOURCE4} .
> cp %{SOURCE5} .
> cp %{SOURCE7} .
>+cp %{SOURCE8} jconsole.desktop
>+cp %{SOURCE9} policytool.desktop
> 
> %build
> ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
>@@ -399,6 +404,17 @@
> install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
> cp -a %{buildoutputdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> 
>+# Install icons and menu entries
>+for s in 16 24 32 48 ; do
>+  install -D -p -m 644 \
>+    openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
>+    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java.png
>+done
>+for e in jconsole policytool ; do
>+    desktop-file-install --vendor=fedora --mode=644 \
>+        --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop
>+done
>+
> # Find JRE directories.
> find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \
>   | grep -v jre/lib/security \
>@@ -503,6 +519,13 @@
>   %{uspolicy} \
>   %{_jvmprivdir}/%{archname}/jce/vanilla/US_export_policy.jar
> 
>+touch --no-create %{_datadir}/icons/hicolor
>+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
>+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
>+fi
>+
>+exit 0
>+
> %postun
> if [ $1 -eq 0 ]
> then
>@@ -519,6 +542,13 @@
>     %{_jvmprivdir}/%{archname}/jce/vanilla/local_policy.jar
> fi
> 
>+touch --no-create %{_datadir}/icons/hicolor
>+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
>+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
>+fi
>+
>+exit 0
>+
> %post devel
> ext=.gz
> alternatives \
>@@ -618,6 +648,8 @@
>   --slave %{_jvmjardir}/java-%{javaver} \
>   java_sdk_%{javaver}_exports %{_jvmjardir}/%{sdklnk}
> 
>+exit 0
>+
> %postun devel
> if [ $1 -eq 0 ]
> then
>@@ -626,22 +658,30 @@
>   alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk}
> fi
> 
>+exit 0
>+
> %post javadoc
> alternatives \
>   --install %{_javadocdir}/java javadocdir %{_javadocdir}/%{name}/api \
>   %{priority}
> 
>+exit 0
>+
> %postun javadoc
> if [ $1 -eq 0 ]
> then
>   alternatives --remove javadocdir %{_javadocdir}/%{name}/api
> fi
> 
>+exit 0
>+
> %post plugin
> alternatives \
>   --install %{syslibdir}/mozilla/plugins/libjavaplugin.so %{javaplugin} \
>   %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so %{priority}
> 
>+exit 0
>+
> %postun plugin
> if [ $1 -eq 0 ]
> then
>@@ -649,6 +689,8 @@
>     %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so
> fi
> 
>+exit 0
>+
> %files -f %{name}.files
> %defattr(-,root,root,-)
> %doc %{buildoutputdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION
>@@ -671,6 +713,8 @@
> %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
> %ghost %{_jvmdir}/%{jredir}/lib/security/local_policy.jar
> %ghost %{_jvmdir}/%{jredir}/lib/security/US_export_policy.jar
>+%{_datadir}/applications/*policytool.desktop
>+%{_datadir}/icons/hicolor/*x*/apps/java.png
> %{_mandir}/man1/java-%{name}.1*
> %{_mandir}/man1/keytool-%{name}.1*
> %{_mandir}/man1/orbd-%{name}.1*
>@@ -696,6 +740,7 @@
> %{_jvmdir}/%{sdkdir}/lib/*
> %{_jvmdir}/%{sdklnk}
> %{_jvmjardir}/%{sdklnk}
>+%{_datadir}/applications/*jconsole.desktop
> %{_mandir}/man1/appletviewer-%{name}.1*
> %{_mandir}/man1/apt-%{name}.1*
> %{_mandir}/man1/extcheck-%{name}.1*

Actions: View | Diff

Attachments on bug 417501: 282361