Hello community, here is the log from the commit of package java-1_7_0-openjdk for openSUSE:12.2 checked in at 2012-08-07 08:10:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/java-1_7_0-openjdk (Old) and /work/SRC/openSUSE:12.2/.java-1_7_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_7_0-openjdk", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/java-1_7_0-openjdk/java-1_7_0-openjdk.changes 2012-06-28 15:29:59.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes 2012-08-07 08:10:30.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Jul 12 07:16:58 UTC 2012 - [email protected] + +- icedtea 2.2.1 does not support zerovm, limit the build to i586 and x86_64 + +------------------------------------------------------------------- +Mon Jul 2 11:08:54 UTC 2012 - [email protected] + +- fix bnc#769543: triplicate menu entries + * store jconsole and policytool in jvmdir and maintain symlink via + update-alternatives only +- use Settings;DesktopSettings;Security; for policytool +- remove uneeded code generates fielists in install section + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.5QhY9r/_old 2012-08-07 08:10:32.000000000 +0200 +++ /var/tmp/diff_new_pack.5QhY9r/_new 2012-08-07 08:10:32.000000000 +0200 @@ -123,6 +123,10 @@ Group: Development/Languages/Java Url: http://icedtea.classpath.org +#XXX: Icedtea 2.2.1 does not build with zero - as a temporary workaround we build older version +# from package java-1_7_0-openjdk.zero for arm and power pc +ExclusiveArch: %{jit_arches} + # hg clone http://icedtea.classpath.org/hg/release/icedtea7-forest/ openjdk -r %{hg_tag} # hg clone http://icedtea.classpath.org/hg/release/icedtea7-forest/corba/ openjdk/corba -r %{hg_tag} # hg clone http://icedtea.classpath.org/hg/release/icedtea7-forest/hotspot/ openjdk/hotspot -r %{hg_tag} @@ -825,45 +829,13 @@ done # Install desktop files. -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps} +install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/pixmaps +install -d -m 0755 $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir}/jre/lib/desktop/ for d in jconsole policytool; do - cp $d.desktop $d-%{sdklnk}.desktop - install -m 0644 $d-%{sdklnk}.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ - %suse_update_desktop_file $d-%{sdklnk} + install -m 0644 $d.desktop $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir}/jre/lib/desktop/ + %suse_update_desktop_file $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir}/jre/lib/desktop/$d.desktop done -# Find JRE directories. -find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \ - | grep -v jre/lib/security \ - | grep -v jconsole-%{sdklnk}.desktop \ - | sed 's|'$RPM_BUILD_ROOT'|%dir |' \ - > %{name}.files -# Find JRE files. -find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type f -o -type l \ - | grep -v jre/lib/security \ - | sed 's|'$RPM_BUILD_ROOT'||' \ - >> %{name}.files -# Find demo directories. -find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/demo \ - $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/sample -type d \ - | sed 's|'$RPM_BUILD_ROOT'|%dir |' \ - > %{name}-demo.files -# Find non-documentation demo files. -find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/demo \ - $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/sample \ - -type f -o -type l | sort \ - | grep -v README \ - | sed 's|'$RPM_BUILD_ROOT'||' \ - >> %{name}-demo.files -# Find documentation demo files. -find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/demo \ - $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/sample \ - -type f -o -type l | sort \ - | grep README \ - | sed 's|'$RPM_BUILD_ROOT'||' \ - | sed 's|^|%doc |' \ - >> %{name}-demo.files - # fdupes links the files from JDK to JRE, so it breaks a JRE # use it carefully :)) %fdupes -s $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir}/ @@ -914,8 +886,8 @@ %{_mandir}/man1/servertool-%{sdklnk}.1$ext \ --slave %{_mandir}/man1/tnameserv.1$ext tnameserv.1$ext \ %{_mandir}/man1/tnameserv-%{sdklnk}.1$ext \ - --slave %{_datadir}/applications/policytool.desktop policytool.desktop\ - %{_datadir}/applications/policytool-%{sdklnk}.desktop + --slave %{_datadir}/applications/policytool.desktop policytool.desktop \ + %{_jvmdir}/%{sdkdir}/jre/lib/desktop/policytool.desktop update-alternatives \ --install %{_jvmdir}/jre-%{origin} \ @@ -1052,8 +1024,8 @@ %{_mandir}/man1/wsimport-%{sdklnk}.1$ext \ --slave %{_mandir}/man1/xjc.1$ext xjc.1$ext \ %{_mandir}/man1/xjc-%{sdklnk}.1$ext \ - --slave %{_datadir}/applications/jconsole.desktop jconsole.desktop\ - %{_datadir}/applications/jconsole-%{sdklnk}.desktop + --slave %{_datadir}/applications/jconsole.desktop jconsole.desktop \ + %{_jvmdir}/%{sdkdir}/jre/lib/desktop/jconsole.desktop update-alternatives \ --install %{_jvmdir}/java-%{origin} \ @@ -1135,7 +1107,8 @@ %config(noreplace) %{_jvmdir}/%{jredir}/lib/management/* %config(noreplace) %{_jvmdir}/%{jredir}/lib/images/cursors/cursors.properties -%{_datadir}/applications/policytool-%{sdklnk}.desktop +%dir %{_jvmdir}/%{sdkdir}/jre/lib/desktop/ +%{_jvmdir}/%{sdkdir}/jre/lib/desktop/policytool.desktop %{_datadir}/icons/hicolor/*/apps/java.png %{_mandir}/man1/java-%{sdklnk}.1* @@ -1170,8 +1143,7 @@ %{jvmjarlink} -# bnc#525097 -%{_datadir}/applications/jconsole-%{sdklnk}.desktop +%{_jvmdir}/%{sdkdir}/jre/lib/desktop/jconsole.desktop %{_mandir}/man1/appletviewer-%{sdklnk}.1* %{_mandir}/man1/apt-%{sdklnk}.1* ++++++ java-1_7_0-openjdk-suse-desktop-files.patch ++++++ --- /var/tmp/diff_new_pack.5QhY9r/_old 2012-08-07 08:10:32.000000000 +0200 +++ /var/tmp/diff_new_pack.5QhY9r/_new 2012-08-07 08:10:32.000000000 +0200 @@ -1,7 +1,7 @@ -Index: java-1_7_0-openjdk/jconsole.desktop +Index: x/jconsole.desktop =================================================================== ---- java-1_7_0-openjdk.orig/jconsole.desktop -+++ java-1_7_0-openjdk/jconsole.desktop +--- x.orig/jconsole.desktop 2011-07-11 17:12:13.000000000 +0200 ++++ x/jconsole.desktop 2012-07-02 13:12:06.282354987 +0200 @@ -1,10 +1,11 @@ [Desktop Entry] Name=OpenJDK Monitoring & Management Console @@ -15,11 +15,11 @@ -Categories=Development;Monitor;Java; +Categories=Development;Profiling; Version=1.0 -Index: java-1_7_0-openjdk/policytool.desktop +Index: x/policytool.desktop =================================================================== ---- java-1_7_0-openjdk.orig/policytool.desktop -+++ java-1_7_0-openjdk/policytool.desktop -@@ -1,10 +1,11 @@ +--- x.orig/policytool.desktop 2011-07-11 17:12:13.000000000 +0200 ++++ x/policytool.desktop 2012-07-02 11:28:22.123649199 +0200 +@@ -1,10 +1,12 @@ [Desktop Entry] Name=OpenJDK Policy Tool +GenericName=OpenJDK Policy Tool @@ -30,5 +30,6 @@ Type=Application StartupWMClass=sun-security-tools-PolicyTool -Categories=Development;Java; -+Categories=Utility;Security; ++Categories=Settings;DesktopSettings;Security; Version=1.0 ++ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
