[netbeans/f16] Fix rhbz 670303 by adding xml-commons-apis.jar to classpath

Omair Majid omajid at fedoraproject.org
Thu Sep 22 16:50:08 UTC 2011


commit 4f0c09832349828968ed6c2e1d00ccd37c3836c1
Author: Omair Majid <omajid at redhat.com>
Date:   Thu Sep 22 12:48:21 2011 -0400

    Fix rhbz 670303 by adding xml-commons-apis.jar to classpath

 add-xml-commons-apis-to-classpath.patch |   10 ++++++++++
 netbeans.spec                           |    8 +++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/add-xml-commons-apis-to-classpath.patch b/add-xml-commons-apis-to-classpath.patch
new file mode 100644
index 0000000..25e9ae0
--- /dev/null
+++ b/add-xml-commons-apis-to-classpath.patch
@@ -0,0 +1,10 @@
+--- netbeans-6.9/ide/launcher/unix/netbeans	2011-09-22 11:54:57.500999423 -0400
++++ netbeans-6.9/ide/launcher/unix/netbeans	2011-09-22 12:05:11.329999884 -0400
+@@ -211,6 +211,7 @@
+             --branding nb \
+             --clusters '"$netbeans_clusters"' \
+             -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
++            -cp:a /usr/share/java/xml-commons-apis.jar \
+             ${netbeans_default_options} \
+             '"$@"'
+         ;;
diff --git a/netbeans.spec b/netbeans.spec
index 36b850d..32ef454 100644
--- a/netbeans.spec
+++ b/netbeans.spec
@@ -134,7 +134,7 @@
 
 Name:           %{nb_}
 Version:        %{nb_ver}
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Integrated Development Environment (IDE)
 Group:          Development/Tools
 License:        GPLv2 with exceptions or CDDL
@@ -176,6 +176,8 @@ Patch8: %{name}-%{version}~71-cluster-properties.patch
 Patch9: %{name}-%{version}~80-suite-xml.patch
 # Work with ini4j 0.5
 Patch10: ini4j-0.5-compat.patch
+# fix for https://bugzilla.redhat.com/show_bug.cgi?id=670303
+Patch11: add-xml-commons-apis-to-classpath.patch
 
 BuildArch: noarch
 
@@ -339,6 +341,7 @@ Local connections are not supported.
 %patch8 -p1 -b .sav
 %patch9 -p1 -b .sav
 %patch10 -p1 -b .sav
+%patch11 -p1 -b .sav
 
 %build
 
@@ -645,6 +648,9 @@ fi
 %doc %{nb_license}
 
 %changelog
+* Thu Sep 22 2011 Omair Majid <omajid at redhat.com> - 6.9-5
+- Fix rhbz670303
+
 * Mon Sep 19 2011 Omair Majid <omajid at redhat.com> - 6.9-4
 - Fix rhbz715654
 - Fix rhbz702842


More information about the scm-commits mailing list