[netbeans] Fix for https://netbeans.org/bugzilla/show_bug.cgi?id=189196

[Victor G. Vasilyev]

commit ba5d12d3249f338f48a636b3235bef1a5b1ba4fa
Author: Victor G. Vasilyev <victor.vasilyev at sun.com>
Date:   Wed Sep 1 22:56:16 2010 +0400

    Fix for https://netbeans.org/bugzilla/show_bug.cgi?id=189196

 netbeans-6.9~80-suite-xml.patch |   12 ++++++++++++
 netbeans.spec                   |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/netbeans-6.9~80-suite-xml.patch b/netbeans-6.9~80-suite-xml.patch
new file mode 100644
index 0000000..cef934d
--- /dev/null
+++ b/netbeans-6.9~80-suite-xml.patch
@@ -0,0 +1,12 @@
+diff -Nur netbeans-6.9/apisupport.harness/release/suite.xml netbeans-6.9.new/apisupport.harness/release/suite.xml
+--- netbeans-6.9/apisupport.harness/release/suite.xml	2010-06-10 15:17:40.000000000 +0400
++++ netbeans-6.9.new/apisupport.harness/release/suite.xml	2010-09-01 22:01:46.397920988 +0400
+@@ -313,7 +313,7 @@
+         <condition property="app.exe.prefix" value="" else="pre7_">
+             <isset property="nbexec.dll.found"/>
+         </condition>
+-        <copy file="${harness.dir}/launchers/${app.exe.prefix}app.exe" tofile="${build.launcher.dir}/bin/${app.name}.exe" overwrite="true"/>
++        <copy file="${harness.dir}/launchers/${app.exe.prefix}app.exe" tofile="${build.launcher.dir}/bin/${app.name}.exe" failonerror="false" overwrite="true"/>
+         <copy file="${harness.dir}/launchers/${app.exe.prefix}app_w.exe" tofile="${build.launcher.dir}/bin/${app.name}_w.exe" failonerror="false" overwrite="true"/>
+ 
+         <copy file="${harness.dir}/launchers/app.sh" tofile="${build.launcher.dir}/bin/${app.name}"/>
diff --git a/netbeans.spec b/netbeans.spec
index 5bcbcae..6448dbf 100644
--- a/netbeans.spec
+++ b/netbeans.spec
@@ -135,7 +135,7 @@
 
 Name:           %{nb_}
 Version:        %{nb_ver}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Integrated Development Environment (IDE)
 Group:          Development/Tools
 License:        GPLv2 with exceptions or CDDL
@@ -172,6 +172,9 @@ Patch6: %{name}-%{version}~60-nosvnkit.patch
 # Sets up IDE configuration
 Patch7: %{name}-%{version}~70-small-ide-cluster.patch
 Patch8: %{name}-%{version}~71-cluster-properties.patch
+# Avoids including windows components in NB app zip
+# https://netbeans.org/bugzilla/show_bug.cgi?id=189196
+Patch9: %{name}-%{version}~80-suite-xml.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -333,6 +336,7 @@ Local connections are not supported.
 %patch6 -p1 -b .sav
 %patch7 -p1 -b .sav
 %patch8 -p1 -b .sav
+%patch9 -p1 -b .sav
 
 %build
 
@@ -603,6 +607,9 @@ fi
 %doc %{nb_license}
 
 %changelog
+* Wed Sep 01 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.9-2
+- Fix for https://netbeans.org/bugzilla/show_bug.cgi?id=189196
+
 * Mon Feb 15 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.9-1
 - introduce the cvsclient subpackage 
   https://bugzilla.redhat.com/show_bug.cgi?id=572165