rpms/netbeans/devel netbeans-6.1-50-ide-launcher.patch, 1.2, 1.3 netbeans.spec, 1.5, 1.6

[Victor G. Vasilyev]

Author: victorv

Update of /cvs/pkgs/rpms/netbeans/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1457

Modified Files:
	netbeans-6.1-50-ide-launcher.patch netbeans.spec 
Log Message:
Release 9: Unset the DESKTOP_STARTUP_ID environment variable ( https://bugzilla.redhat.com/show_bug.cgi?id=467546 )


netbeans-6.1-50-ide-launcher.patch:

Index: netbeans-6.1-50-ide-launcher.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/netbeans-6.1-50-ide-launcher.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- netbeans-6.1-50-ide-launcher.patch	1 Oct 2008 14:02:22 -0000	1.2
+++ netbeans-6.1-50-ide-launcher.patch	22 Oct 2008 15:08:43 -0000	1.3
@@ -1,7 +1,25 @@
 diff -Nur netbeans-ide-launcher/ide/launcher/unix/netbeans netbeans-ide-launcher.new/ide/launcher/unix/netbeans
 --- netbeans-ide-launcher/ide/launcher/unix/netbeans	2008-06-30 17:47:50.000000000 +0400
-+++ netbeans-ide-launcher.new/ide/launcher/unix/netbeans	2008-10-01 03:32:59.000000000 +0400
-@@ -54,16 +54,18 @@
++++ netbeans-ide-launcher.new/ide/launcher/unix/netbeans	2008-10-22 15:58:13.000000000 +0400
+@@ -38,6 +38,17 @@
+ # Version 2 license, then the option applies only if the new code is
+ # made subject to such option by the copyright holder.
+ 
++# The Startup Notification Protocol Specification established by freedesktop.org
++# recommends to unset the DESKTOP_STARTUP_ID environment variable to avoid
++# possible reuse by some process started later by this process, e.g. when a browser
++# will be started after clicking a hyperlink in the NetBeans.
++if [ ! -z $DESKTOP_STARTUP_ID ] ; then
++    # Save a value for later using in the NB_DESKTOP_STARTUP_ID
++    NB_DESKTOP_STARTUP_ID=$DESKTOP_STARTUP_ID; export NB_DESKTOP_STARTUP_ID
++
++    unset DESKTOP_STARTUP_ID
++fi
++
+ #
+ # resolve symlinks
+ #
+@@ -54,16 +65,18 @@
      fi
  done
  
@@ -24,7 +42,7 @@
  
  
  # #68373: look for userdir, but do not modify "$@"
-@@ -199,7 +201,6 @@
+@@ -199,7 +212,6 @@
              --branding nb \
              --clusters '"$netbeans_clusters"' \
              -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \


Index: netbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/netbeans.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- netbeans.spec	13 Oct 2008 12:31:10 -0000	1.5
+++ netbeans.spec	22 Oct 2008 15:08:43 -0000	1.6
@@ -80,7 +80,7 @@
 
 Name:           %{nb_}
 Version:        %{nb_ver}
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        NetBeans Integrated Development Environment (IDE)
 Group:          Development/Tools
 License:        GPLv2 with exceptions or CDDL
@@ -98,6 +98,9 @@
 Patch2: %{name}-%{version}-20-ant-build.patch
 Patch3: %{name}-%{version}-30-parse-project-xml.patch
 Patch4: %{name}-%{version}-40-build-xml.patch
+# http://wiki.netbeans.org/Fedora10PackagingNBIDELauncher
+# https://bugzilla.redhat.com/show_bug.cgi?id=464820
+# https://bugzilla.redhat.com/show_bug.cgi?id=467546
 Patch5: %{name}-%{version}-50-ide-launcher.patch
 Patch6: %{name}-%{version}-60-small-ide-config.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=466179
@@ -457,6 +460,9 @@
 %doc nbbuild/standard-nbm-license.txt
 
 %changelog
+* Wed Oct 22 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-9
+- Unset the DESKTOP_STARTUP_ID environment variable (#467546). The netbeans-6.1-50-ide-launcher.patch is modified.
+
 * Thu Oct 09 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-8
 - Update center - NetBeans is disabled, update center - NetBeans for Fedora is added (#466179)
 - Some cosmetics