rpms/netbeans/devel netbeans-6.8~00-updatecenters.patch, NONE, 1.1 netbeans-6.8~10-ant-patch.patch, NONE, 1.1 netbeans-6.8~20-welcome.patch, NONE, 1.1 netbeans-6.8~30-build-xml.patch, NONE, 1.1 netbeans-6.8~40-ide-launcher.patch, NONE, 1.1 netbeans-6.8~50-build-copy.patch, NONE, 1.1 netbeans-6.8~60-nosvnkit.patch, NONE, 1.1 netbeans-6.8~70-small-ide-cluster.patch, NONE, 1.1 netbeans-6.8~71-cluster-properties.patch, NONE, 1.1 netbeans-6.8~80-check-modules.patch, NONE, 1.1 netbeans-6.8~90-copy_license.patch, NONE, 1.1 netbeans-6.8~99-jruby_deps.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 import.log, 1.2, 1.3 netbeans.spec, 1.12, 1.13 sources, 1.4, 1.5 netbeans-6.7.1 at 00-updatecenters.patch, 1.1, NONE netbeans-6.7.1 at 10-ant-patch.patch, 1.1, NONE netbeans-6.7.1 at 20-parse-project-xml.patch, 1.1, NONE netbeans-6.7.1 at 30-build-xml.patch, 1.1, NONE netbeans-6.7.1 at 40-ide-launcher.patch, 1.1, NONE netbeans-6.7.1 at 50-build-copy.patch, 1.1, NONE netbeans-6.7.1 at 60-nosvnkit.patch, 1.1, NONE netbeans-6.7.1 at 70-small-ide-cluster.patch, 1.1, NONE netbeans-6.7.1 at 80-check-modules.patch, 1.1, NONE netbeans-6.7.1 at 90-copy_license.patch, 1.1, NONE
Victor G. Vasilyev
victorv at fedoraproject.org
Sun Feb 7 01:30:16 UTC 2010
Author: victorv
Update of /cvs/pkgs/rpms/netbeans/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27898/devel
Modified Files:
.cvsignore import.log netbeans.spec sources
Added Files:
netbeans-6.8~00-updatecenters.patch
netbeans-6.8~10-ant-patch.patch netbeans-6.8~20-welcome.patch
netbeans-6.8~30-build-xml.patch
netbeans-6.8~40-ide-launcher.patch
netbeans-6.8~50-build-copy.patch
netbeans-6.8~60-nosvnkit.patch
netbeans-6.8~70-small-ide-cluster.patch
netbeans-6.8~71-cluster-properties.patch
netbeans-6.8~80-check-modules.patch
netbeans-6.8~90-copy_license.patch
netbeans-6.8~99-jruby_deps.patch
Removed Files:
netbeans-6.7.1 at 00-updatecenters.patch
netbeans-6.7.1 at 10-ant-patch.patch
netbeans-6.7.1 at 20-parse-project-xml.patch
netbeans-6.7.1 at 30-build-xml.patch
netbeans-6.7.1 at 40-ide-launcher.patch
netbeans-6.7.1 at 50-build-copy.patch
netbeans-6.7.1 at 60-nosvnkit.patch
netbeans-6.7.1 at 70-small-ide-cluster.patch
netbeans-6.7.1 at 80-check-modules.patch
netbeans-6.7.1 at 90-copy_license.patch
Log Message:
Update to version 6.8 with removed dependencies on JRuby's packages
netbeans-6.8~00-updatecenters.patch:
Bundle.properties | 2 ++
mf-layer.xml | 12 +++++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
--- NEW FILE netbeans-6.8~00-updatecenters.patch ---
diff -Nur netbeans-6.8/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties netbeans-6.8.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
--- netbeans-6.8/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties 2009-12-05 04:59:44.000000000 +0300
+++ netbeans-6.8.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties 2009-12-05 05:18:39.107934640 +0300
@@ -51,8 +51,10 @@
Services/AutoupdateType/beta-update-provider.instance=NetBeans Beta
Services/AutoupdateType/thirdparty-update-provider.instance=3rd Party Plugins
Services/AutoupdateType/pluginportal-update-provider.instance=Plugin Portal
+Services/AutoupdateType/standard-update-provider-fedora.instance=NetBeans for Fedora
#NOI18N
URL_Standard=http://updates.netbeans.org/netbeans/updates/6.8/uc/final/stable/catalog.xml.gz?{$netbeans.hash.code}
URL_Beta=http://updates.netbeans.org/netbeans/updates/6.8/uc/final/beta/catalog.xml.gz?{$netbeans.hash.code}
URL_ThirdParty=http://updates.netbeans.org/netbeans/updates/6.8/uc/final/thirdparty/catalog.xml.gz?{$netbeans.hash.code}
URL_PluginPortal=http://plugins.netbeans.org/nbpluginportal/updates/6.8/catalog.xml.gz
+URL_Standard_Fedora=http://updates.netbeans.org/netbeans/updates/6.8/uc/final/fedora/catalog.xml.gz?{$netbeans.hash.code}
diff -Nur netbeans-6.8/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml netbeans-6.8.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
--- netbeans-6.8/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml 2009-12-05 05:00:03.000000000 +0300
+++ netbeans-6.8.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml 2009-12-05 05:21:10.899900016 +0300
@@ -53,7 +53,7 @@
<attr name="url_key" stringvalue="URL_Standard"/>
<attr name="category" stringvalue="STANDARD"/>
- <attr name="enabled" boolvalue="true"/>
+ <attr name="enabled" boolvalue="false"/>
<attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider" />
<attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider" />
</file>
@@ -91,6 +91,16 @@
<attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider" />
</file>
+ <file name="standard-update-provider-fedora.instance">
+ <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.updatecenters.resources.Bundle"/>
+ <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
+ <attr name="url_key" stringvalue="URL_Standard_Fedora"/>
+ <attr name="category" stringvalue="STANDARD"/>
+ <attr name="enabled" boolvalue="true"/>
+ <attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider" />
+ <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider" />
+ </file>
+
</folder>
</folder> <!-- Services -->
netbeans-6.8~10-ant-patch.patch:
build.xml | 15 ---------------
external/build.xml | 1 -
2 files changed, 16 deletions(-)
--- NEW FILE netbeans-6.8~10-ant-patch.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.5/o.apache.tools.ant.module/build.xml netbeans-6.5.new/o.apache.tools.ant.module/build.xml
--- netbeans-6.5/o.apache.tools.ant.module/build.xml 2008-11-10 00:13:56.000000000 +0300
+++ netbeans-6.5.new/o.apache.tools.ant.module/build.xml 2009-01-10 19:16:13.000000000 +0300
@@ -75,21 +75,6 @@
</target>
<target name="netbeans-extra" depends="jar-bridge">
- <mkdir dir="${cluster}/ant/lib"/>
- <copy todir="${cluster}/ant/lib">
- <fileset dir="external/lib"/>
- </copy>
- <unzip dest="${cluster}/ant">
- <fileset dir="external">
- <include name="ant-misc-*.zip"/>
- </fileset>
- </unzip>
- <chmod perm="ugo+x">
- <fileset dir="${cluster}/ant/bin">
- <exclude name="*.cmd"/>
- <exclude name="*.bat"/>
- </fileset>
- </chmod>
</target>
<target name="test-build" depends="jar-bridge,projectized-common.test-build"/>
diff -Nur -x '*.orig' -x '*~' netbeans-6.5/o.apache.tools.ant.module/external/build.xml netbeans-6.5.new/o.apache.tools.ant.module/external/build.xml
--- netbeans-6.5/o.apache.tools.ant.module/external/build.xml 2008-11-10 00:13:56.000000000 +0300
+++ netbeans-6.5.new/o.apache.tools.ant.module/external/build.xml 2009-01-10 19:15:52.000000000 +0300
@@ -42,7 +42,6 @@
-->
<project name="o.apache.tools.ant.module/external" default="unzip" basedir=".">
<target name="unzip">
- <unzip src="ant-libs-1.7.1.zip" dest="lib"/>
</target>
<target name="clean">
<delete dir="lib"/>
netbeans-6.8~20-welcome.patch:
layer.xml | 6 ------
1 file changed, 6 deletions(-)
--- NEW FILE netbeans-6.8~20-welcome.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/welcome/src/org/netbeans/modules/welcome/resources/layer.xml netbeans-6.7.1.new/welcome/src/org/netbeans/modules/welcome/resources/layer.xml
--- netbeans-6.7.1/welcome/src/org/netbeans/modules/welcome/resources/layer.xml 2009-08-18 19:52:50.000000000 +0400
+++ netbeans-6.7.1.new/welcome/src/org/netbeans/modules/welcome/resources/layer.xml 2009-08-18 20:16:07.000000000 +0400
@@ -94,12 +94,6 @@
<attr name="position" intvalue="400"/>
</file>
- <file name="kenai_default.instance">
- <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.welcome.resources.Bundle"/>
- <attr name="instanceClass" stringvalue="org.netbeans.modules.welcome.ui.KenaiAction"/>
- <attr name="instanceOf" stringvalue="javax.swing.Action"/>
- <attr name="position" intvalue="500"/>
- </file>
</folder>
<folder name="GettingStartedLinksJavaFX">
netbeans-6.8~30-build-xml.patch:
nbbuild/build.xml | 1 -
o.n.bootstrap/build.xml | 2 --
2 files changed, 3 deletions(-)
--- NEW FILE netbeans-6.8~30-build-xml.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.7/nbbuild/build.xml netbeans-6.7.new/nbbuild/build.xml
--- netbeans-6.7/nbbuild/build.xml 2009-07-20 21:24:40.000000000 +0400
+++ netbeans-6.7.new/nbbuild/build.xml 2009-07-20 21:29:30.000000000 +0400
@@ -568,7 +568,6 @@
<mkdir dir="${netbeans.dest.dir}/bin" />
<copy file="../ide/launcher/unix/netbeans" todir="${netbeans.dest.dir}/bin" />
<chmod file="${netbeans.dest.dir}/bin/netbeans" perm="ugo+rx"/>
- <copy file="../ide/launcher/windows/netbeans.exe" todir="${netbeans.dest.dir}/bin" />
<!-- if anybody knows better place for icons, let me know: jtulach at netbeans.org -->
<mkdir dir="${netbeans.dest.dir}/etc" />
diff -Nur -x '*.orig' -x '*~' netbeans-6.7/o.n.bootstrap/build.xml netbeans-6.7.new/o.n.bootstrap/build.xml
--- netbeans-6.7/o.n.bootstrap/build.xml 2009-07-20 21:24:40.000000000 +0400
+++ netbeans-6.7.new/o.n.bootstrap/build.xml 2009-07-20 21:29:31.000000000 +0400
@@ -65,8 +65,6 @@
<target name="release" depends="init">
<copy file="launcher/unix/nbexec" todir="${cluster}/lib" />
<chmod file="${cluster}/lib/nbexec" perm="ugo+rx"/>
- <copy file="launcher/windows/nbexec.exe" todir="${cluster}/lib/" />
- <copy file="launcher/windows/nbexec.dll" todir="${cluster}/lib/" />
<fixcrlf srcdir="${cluster}/lib" eol="lf">
<include name="**/*.sh"/>
<include name="**/ide.cfg"/>
netbeans-6.8~40-ide-launcher.patch:
netbeans | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
--- NEW FILE netbeans-6.8~40-ide-launcher.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/ide/launcher/unix/netbeans netbeans-6.7.1.new/ide/launcher/unix/netbeans
--- netbeans-6.8/ide/launcher/unix/netbeans 2009-07-27 15:43:48.000000000 +0400
+++ netbeans-6.8.new/ide/launcher/unix/netbeans 2009-07-27 15:56:36.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
-progdir=`dirname "$PRG"`
+#progdir=`dirname "$PRG"`
+# Patch for Debian/Ubuntu/Fedora where launcher is in /usr/bin
+progdir=/usr/share/netbeans/6.8/bin
if [ -f "$progdir"/../etc/netbeans.conf ] ; then
. "$progdir"/../etc/netbeans.conf
fi
# following should be done just in RPM or Solaris Launcher
-# if [ -f /etc/netbeans.conf ] ; then
-# . /etc/netbeans.conf
-# fi
+if [ -f /etc/netbeans.conf ] ; then
+ . /etc/netbeans.conf
+fi
# #68373: look for userdir, but do not modify "$@"
@@ -195,7 +208,6 @@
--branding nb \
--clusters '"$netbeans_clusters"' \
-J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
- -J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \
${netbeans_default_options} \
'"$@"'
;;
netbeans-6.8~50-build-copy.patch:
css.editor/nbproject/project.properties | 2 +-
html.editor/nbproject/project.properties | 2 +-
junit/nbproject/project.properties | 10 +++++-----
libs.bytelist/nbproject/project.properties | 2 +-
libs.commons_logging/nbproject/project.properties | 2 +-
libs.commons_net/nbproject/project.properties | 2 +-
libs.freemarker/nbproject/project.properties | 2 +-
libs.ini4j/nbproject/project.properties | 2 +-
libs.jakarta_oro/nbproject/project.properties | 2 +-
libs.javacapi/nbproject/project.properties | 2 +-
libs.javacimpl/nbproject/project.properties | 2 +-
libs.jna/nbproject/project.properties | 2 +-
libs.jsch/nbproject/project.properties | 2 +-
libs.junit4/nbproject/project.properties | 2 +-
libs.jvyamlb/nbproject/project.properties | 2 +-
libs.jzlib/nbproject/project.properties | 2 +-
libs.lucene/nbproject/project.properties | 2 +-
libs.svnClientAdapter/nbproject/project.properties | 4 ++--
libs.swingx/nbproject/project.properties | 2 +-
libs.xerces/nbproject/project.properties | 2 +-
o.apache.xml.resolver/nbproject/project.properties | 2 +-
o.jdesktop.beansbinding/nbproject/project.properties | 4 ++--
o.jdesktop.layout/nbproject/project.properties | 6 +++---
servletapi/nbproject/project.properties | 2 +-
swingapp/nbproject/project.properties | 6 +++---
25 files changed, 35 insertions(+), 35 deletions(-)
--- NEW FILE netbeans-6.8~50-build-copy.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/css.editor/nbproject/project.properties netbeans-6.8.new/css.editor/nbproject/project.properties
--- netbeans-6.8/css.editor/nbproject/project.properties 2009-12-04 16:32:02.000000000 +0300
+++ netbeans-6.8.new/css.editor/nbproject/project.properties 2010-01-20 18:43:33.000000000 +0300
@@ -37,7 +37,7 @@
# Version 2 license, then the option applies only if the new code is
# made subject to such option by the copyright holder.
-release.external/css21-spec.zip=docs/css21-spec.zip
+#release.external/css21-spec.zip=docs/css21-spec.zip
jnlp.indirect.jars=docs/css21-spec.zip
javac.compilerargs=-Xlint -Xlint:-serial
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/html.editor/nbproject/project.properties netbeans-6.8.new/html.editor/nbproject/project.properties
--- netbeans-6.8/html.editor/nbproject/project.properties 2009-12-04 16:32:40.000000000 +0300
+++ netbeans-6.8.new/html.editor/nbproject/project.properties 2010-01-20 18:43:33.000000000 +0300
@@ -37,7 +37,7 @@
# Version 2 license, then the option applies only if the new code is
# made subject to such option by the copyright holder.
-release.external/html-4.01.zip=docs/html-4.01.zip
+#release.external/html-4.01.zip=docs/html-4.01.zip
javac.compilerargs=-Xlint:unchecked
javac.source=1.5
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/junit/nbproject/project.properties netbeans-6.8.new/junit/nbproject/project.properties
--- netbeans-6.8/junit/nbproject/project.properties 2009-12-04 16:33:46.000000000 +0300
+++ netbeans-6.8.new/junit/nbproject/project.properties 2010-01-20 18:43:33.000000000 +0300
@@ -42,11 +42,11 @@
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
-release.external/junit-3.8.2.jar=modules/ext/junit-3.8.2.jar
-release.external/junit-3.8.2-api.zip=docs/junit-3.8.2-api.zip
-release.external/junit-4.5-api.zip=docs/junit-4.5-api.zip
-release.external/junit-4.5-src.jar=docs/junit-4.5-src.jar
-release.external/Ant-1.7.1-binary-patch-72080.jar=ant/patches/72080.jar
+#release.external/junit-3.8.2.jar=modules/ext/junit-3.8.2.jar
+#release.external/junit-3.8.2-api.zip=docs/junit-3.8.2-api.zip
+#release.external/junit-4.5-api.zip=docs/junit-4.5-api.zip
+#release.external/junit-4.5-src.jar=docs/junit-4.5-src.jar
+#release.external/Ant-1.7.1-binary-patch-72080.jar=ant/patches/72080.jar
# XXX AntBridge.createMainClassPath probably would not find this anyway:
jnlp.verify.excludes=ant/patches/72080.jar
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/libs.bytelist/nbproject/project.properties netbeans-6.8.new/libs.bytelist/nbproject/project.properties
--- netbeans-6.8/libs.bytelist/nbproject/project.properties 2009-12-04 16:33:54.000000000 +0300
+++ netbeans-6.8.new/libs.bytelist/nbproject/project.properties 2010-01-20 19:02:40.000000000 +0300
@@ -38,5 +38,5 @@
# made subject to such option by the copyright holder.
is.autoload=true
-release.external/bytelist-0.1.jar=modules/ext/bytelist-0.1.jar
+#release.external/bytelist-0.1.jar=modules/ext/bytelist-0.1.jar
spec.version.base=0.5.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/libs.commons_logging/nbproject/project.properties netbeans-6.8.new/libs.commons_logging/nbproject/project.properties
--- netbeans-6.8/libs.commons_logging/nbproject/project.properties 2009-12-04 16:33:54.000000000 +0300
+++ netbeans-6.8.new/libs.commons_logging/nbproject/project.properties 2010-01-20 18:43:33.000000000 +0300
@@ -38,5 +38,5 @@
# made subject to such option by the copyright holder.
is.autoload=true
-release.external/commons-logging-1.1.jar=modules/ext/commons-logging-1.1.jar
+#release.external/commons-logging-1.1.jar=modules/ext/commons-logging-1.1.jar
spec.version.base=1.11.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/libs.commons_net/nbproject/project.properties netbeans-6.8.new/libs.commons_net/nbproject/project.properties
--- netbeans-6.8/libs.commons_net/nbproject/project.properties 2009-12-04 16:33:54.000000000 +0300
+++ netbeans-6.8.new/libs.commons_net/nbproject/project.properties 2010-01-20 18:43:33.000000000 +0300
@@ -38,5 +38,5 @@
# made subject to such option by the copyright holder.
is.autoload=true
-release.external/commons-net-1.4.1.jar=modules/ext/commons-net-1.4.1.jar
+#release.external/commons-net-1.4.1.jar=modules/ext/commons-net-1.4.1.jar
spec.version.base=1.6.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/libs.freemarker/nbproject/project.properties netbeans-6.8.new/libs.freemarker/nbproject/project.properties
--- netbeans-6.8/libs.freemarker/nbproject/project.properties 2009-12-04 16:33:54.000000000 +0300
+++ netbeans-6.8.new/libs.freemarker/nbproject/project.properties 2010-01-20 18:43:33.000000000 +0300
@@ -41,6 +41,6 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.5
-release.external/freemarker-2.3.8.jar=modules/ext/freemarker-2.3.8.jar
+#release.external/freemarker-2.3.8.jar=modules/ext/freemarker-2.3.8.jar
module.jar.verifylinkageignores=freemarker.((ext.ant.FreemarkerXmlTask)|(template.DefaultObjectWrapper))
spec.version.base=2.9.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/libs.ini4j/nbproject/project.properties netbeans-6.8.new/libs.ini4j/nbproject/project.properties
--- netbeans-6.8/libs.ini4j/nbproject/project.properties 2009-12-04 16:33:54.000000000 +0300
+++ netbeans-6.8.new/libs.ini4j/nbproject/project.properties 2010-01-20 18:43:33.000000000 +0300
@@ -38,7 +38,7 @@
# made subject to such option by the copyright holder.
is.autoload=true
-release.external/ini4j-0.4.1.jar=modules/ext/ini4j-0.4.1.jar
+#release.external/ini4j-0.4.1.jar=modules/ext/ini4j-0.4.1.jar
module.jar.verifylinkageignores=org.ini4j.IniPreferencesFactoryListener
# Fatal error: class javax.servlet.ServletContextListener not found
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/libs.jakarta_oro/nbproject/project.properties netbeans-6.8.new/libs.jakarta_oro/nbproject/project.properties
--- netbeans-6.8/libs.jakarta_oro/nbproject/project.properties 2009-12-04 16:33:54.000000000 +0300
+++ netbeans-6.8.new/libs.jakarta_oro/nbproject/project.properties 2010-01-20 18:43:33.000000000 +0300
@@ -38,5 +38,5 @@
# made subject to such option by the copyright holder.
is.autoload=true
-release.external/jakarta-oro-2.0.8.jar=modules/ext/jakarta-oro-2.0.8.jar
+#release.external/jakarta-oro-2.0.8.jar=modules/ext/jakarta-oro-2.0.8.jar
spec.version.base=1.5.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/libs.javacapi/nbproject/project.properties netbeans-6.8.new/libs.javacapi/nbproject/project.properties
--- netbeans-6.8/libs.javacapi/nbproject/project.properties 2009-12-04 16:33:54.000000000 +0300
+++ netbeans-6.8.new/libs.javacapi/nbproject/project.properties 2010-01-20 18:43:33.000000000 +0300
@@ -44,6 +44,6 @@
nbm.homepage=http://jackpot.netbeans.org/
nbm.module.author=Petr Hrebejk, Sun Microsystems, Inc.
spec.version.base=0.11.1
-release.external/javac-api-nb-7.0-b07.jar=modules/ext/javac-api-nb-7.0-b07.jar
+#release.external/javac-api-nb-7.0-b07.jar=modules/ext/javac-api-nb-7.0-b07.jar
javadoc.arch=${basedir}/arch.xml
module.javadoc.packages=com.sun.source.tree,com.sun.source.util
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/libs.javacimpl/nbproject/project.properties netbeans-6.8.new/libs.javacimpl/nbproject/project.properties
--- netbeans-6.8/libs.javacimpl/nbproject/project.properties 2009-12-04 16:33:54.000000000 +0300
+++ netbeans-6.8.new/libs.javacimpl/nbproject/project.properties 2010-01-20 18:43:33.000000000 +0300
@@ -41,7 +41,7 @@
nbm.homepage=http://jackpot.netbeans.org/
nbm.module.author=Petr Hrebejk, Sun Microsystems, Inc.
spec.version.base=0.13.1
-release.external/javac-impl-nb-7.0-b07.jar=modules/ext/javac-impl-nb-7.0-b07.jar
+#release.external/javac-impl-nb-7.0-b07.jar=modules/ext/javac-impl-nb-7.0-b07.jar
javadoc.arch=${basedir}/arch.xml
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/libs.jna/nbproject/project.properties netbeans-6.8.new/libs.jna/nbproject/project.properties
--- netbeans-6.8/libs.jna/nbproject/project.properties 2009-12-04 16:33:54.000000000 +0300
+++ netbeans-6.8.new/libs.jna/nbproject/project.properties 2010-01-20 18:43:33.000000000 +0300
@@ -37,4 +37,4 @@
# Version 2 license, then the option applies only if the new code is
# made subject to such option by the copyright holder.
-release.external/jna-3.0.9.jar=modules/ext/jna-3.0.9.jar
+#release.external/jna-3.0.9.jar=modules/ext/jna-3.0.9.jar
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/libs.jsch/nbproject/project.properties netbeans-6.8.new/libs.jsch/nbproject/project.properties
--- netbeans-6.8/libs.jsch/nbproject/project.properties 2009-12-04 16:33:54.000000000 +0300
+++ netbeans-6.8.new/libs.jsch/nbproject/project.properties 2010-01-20 18:43:33.000000000 +0300
@@ -38,6 +38,6 @@
# made subject to such option by the copyright holder.
is.autoload=true
-release.external/jsch-0.1.41.jar=modules/ext/jsch-0.1.41.jar
+#release.external/jsch-0.1.41.jar=modules/ext/jsch-0.1.41.jar
sigtest.gen.fail.on.error=false
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/libs.junit4/nbproject/project.properties netbeans-6.8.new/libs.junit4/nbproject/project.properties
--- netbeans-6.8/libs.junit4/nbproject/project.properties 2009-12-04 16:33:54.000000000 +0300
+++ netbeans-6.8.new/libs.junit4/nbproject/project.properties 2010-01-20 18:43:33.000000000 +0300
@@ -38,7 +38,7 @@
# made subject to such option by the copyright holder.
is.autoload=true
-release.external/junit-4.5.jar=modules/ext/junit-4.5.jar
+#release.external/junit-4.5.jar=modules/ext/junit-4.5.jar
sigtest.skip.check=true
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/libs.jvyamlb/nbproject/project.properties netbeans-6.8.new/libs.jvyamlb/nbproject/project.properties
--- netbeans-6.8/libs.jvyamlb/nbproject/project.properties 2009-12-04 16:33:54.000000000 +0300
+++ netbeans-6.8.new/libs.jvyamlb/nbproject/project.properties 2010-01-20 19:02:59.000000000 +0300
@@ -38,6 +38,6 @@
# made subject to such option by the copyright holder.
is.autoload=true
-release.external/jvyamlb-0.2.3.jar=modules/ext/jvyamlb-0.2.3.jar
+#release.external/jvyamlb-0.2.3.jar=modules/ext/jvyamlb-0.2.3.jar
sigtest.gen.fail.on.error=false
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/libs.jzlib/nbproject/project.properties netbeans-6.8.new/libs.jzlib/nbproject/project.properties
--- netbeans-6.8/libs.jzlib/nbproject/project.properties 2009-12-04 16:33:54.000000000 +0300
+++ netbeans-6.8.new/libs.jzlib/nbproject/project.properties 2010-01-20 19:03:19.000000000 +0300
@@ -38,6 +38,6 @@
# made subject to such option by the copyright holder.
is.autoload=true
-release.external/jzlib-1.0.7.jar=modules/ext/jzlib-1.0.7.jar
+#release.external/jzlib-1.0.7.jar=modules/ext/jzlib-1.0.7.jar
spec.version.base=1.2.1
sigtest.gen.fail.on.error=false
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/libs.lucene/nbproject/project.properties netbeans-6.8.new/libs.lucene/nbproject/project.properties
--- netbeans-6.8/libs.lucene/nbproject/project.properties 2009-12-04 16:33:54.000000000 +0300
+++ netbeans-6.8.new/libs.lucene/nbproject/project.properties 2010-01-20 18:43:33.000000000 +0300
@@ -38,5 +38,5 @@
# made subject to such option by the copyright holder.
is.autoload=true
-release.external/lucene-core-2.4.1.jar=modules/ext/lucene-core-2.4.1.jar
+#release.external/lucene-core-2.4.1.jar=modules/ext/lucene-core-2.4.1.jar
spec.version.base=2.8.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/libs.svnClientAdapter/nbproject/project.properties netbeans-6.8.new/libs.svnClientAdapter/nbproject/project.properties
--- netbeans-6.8/libs.svnClientAdapter/nbproject/project.properties 2009-12-04 16:33:54.000000000 +0300
+++ netbeans-6.8.new/libs.svnClientAdapter/nbproject/project.properties 2010-01-20 18:43:33.000000000 +0300
@@ -40,8 +40,8 @@
is.autoload=true
javac.source=1.5
-release.external/svnClientAdapter-1.6.0.jar=modules/ext/svnClientAdapter-1.6.0.jar
-release.external/svnjavahl-1.6.0.jar=modules/ext/svnjavahl-1.6.0.jar
+#release.external/svnClientAdapter-1.6.0.jar=modules/ext/svnClientAdapter-1.6.0.jar
+#release.external/svnjavahl-1.6.0.jar=modules/ext/svnjavahl-1.6.0.jar
# Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected byte[] org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine.execBytes(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine
# Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected java.lang.String org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine.execString(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/libs.swingx/nbproject/project.properties netbeans-6.8.new/libs.swingx/nbproject/project.properties
--- netbeans-6.8/libs.swingx/nbproject/project.properties 2009-12-04 16:33:54.000000000 +0300
+++ netbeans-6.8.new/libs.swingx/nbproject/project.properties 2010-01-20 19:03:35.000000000 +0300
@@ -37,6 +37,6 @@
# Version 2 license, then the option applies only if the new code is
# made subject to such option by the copyright holder.
-release.external/swingx-0.9.5.jar=modules/ext/swingx-0.9.5.jar
+#release.external/swingx-0.9.5.jar=modules/ext/swingx-0.9.5.jar
sigtest.gen.fail.on.error=false
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/libs.xerces/nbproject/project.properties netbeans-6.8.new/libs.xerces/nbproject/project.properties
--- netbeans-6.8/libs.xerces/nbproject/project.properties 2009-12-04 16:33:54.000000000 +0300
+++ netbeans-6.8.new/libs.xerces/nbproject/project.properties 2010-01-20 18:43:33.000000000 +0300
@@ -38,6 +38,6 @@
# made subject to such option by the copyright holder.
is.autoload=true
-release.external/xerces-2.8.0.jar=modules/ext/xerces-2.8.0.jar
+#release.external/xerces-2.8.0.jar=modules/ext/xerces-2.8.0.jar
module.jar.verifylinkageignores=org.apache.xerces.util.XMLCatalogResolver
spec.version.base=1.16.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/o.apache.xml.resolver/nbproject/project.properties netbeans-6.8.new/o.apache.xml.resolver/nbproject/project.properties
--- netbeans-6.8/o.apache.xml.resolver/nbproject/project.properties 2009-12-04 16:34:18.000000000 +0300
+++ netbeans-6.8.new/o.apache.xml.resolver/nbproject/project.properties 2010-01-20 18:43:33.000000000 +0300
@@ -38,5 +38,5 @@
# made subject to such option by the copyright holder.
is.autoload=true
-release.external/resolver-1.2.jar=modules/ext/resolver-1.2.jar
+#release.external/resolver-1.2.jar=modules/ext/resolver-1.2.jar
spec.version.base=1.9.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/o.jdesktop.beansbinding/nbproject/project.properties netbeans-6.8.new/o.jdesktop.beansbinding/nbproject/project.properties
--- netbeans-6.8/o.jdesktop.beansbinding/nbproject/project.properties 2009-12-04 16:34:18.000000000 +0300
+++ netbeans-6.8.new/o.jdesktop.beansbinding/nbproject/project.properties 2010-01-20 18:43:33.000000000 +0300
@@ -38,7 +38,7 @@
# made subject to such option by the copyright holder.
is.autoload=true
-release.external/beansbinding-1.2.1.jar=modules/ext/beansbinding-1.2.1.jar
-release.external/beansbinding-1.2.1-doc.zip=docs/beansbinding-1.2.1-doc.zip
+#release.external/beansbinding-1.2.1.jar=modules/ext/beansbinding-1.2.1.jar
+#release.external/beansbinding-1.2.1-doc.zip=docs/beansbinding-1.2.1-doc.zip
jnlp.indirect.jars=docs/beansbinding-1.2.1-doc.zip
spec.version.base=1.5.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/o.jdesktop.layout/nbproject/project.properties netbeans-6.8.new/o.jdesktop.layout/nbproject/project.properties
--- netbeans-6.8/o.jdesktop.layout/nbproject/project.properties 2009-12-04 16:34:18.000000000 +0300
+++ netbeans-6.8.new/o.jdesktop.layout/nbproject/project.properties 2010-01-20 18:43:33.000000000 +0300
@@ -38,8 +38,8 @@
# made subject to such option by the copyright holder.
is.autoload=true
-release.external/swing-layout-1.0.4.jar=modules/ext/swing-layout-1.0.4.jar
-release.external/swing-layout-1.0.4-doc.zip=docs/swing-layout-1.0.4-doc.zip
-release.external/swing-layout-1.0.4-src.zip=docs/swing-layout-1.0.4-src.zip
+#release.external/swing-layout-1.0.4.jar=modules/ext/swing-layout-1.0.4.jar
+#release.external/swing-layout-1.0.4-doc.zip=docs/swing-layout-1.0.4-doc.zip
+#release.external/swing-layout-1.0.4-src.zip=docs/swing-layout-1.0.4-src.zip
jnlp.indirect.jars=docs/swing-layout-1.0.4-doc.zip, docs/swing-layout-1.0.4-src.zip
spec.version.base=1.10.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/servletapi/nbproject/project.properties netbeans-6.8.new/servletapi/nbproject/project.properties
--- netbeans-6.8/servletapi/nbproject/project.properties 2009-12-04 16:35:10.000000000 +0300
+++ netbeans-6.8.new/servletapi/nbproject/project.properties 2010-01-20 19:05:19.000000000 +0300
@@ -38,4 +38,4 @@
# made subject to such option by the copyright holder.
is.autoload=true
-release.external/servlet-2.2.jar=modules/ext/servlet-2.2.jar
+#release.external/servlet-2.2.jar=modules/ext/servlet-2.2.jar
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/swingapp/nbproject/project.properties netbeans-6.8.new/swingapp/nbproject/project.properties
--- netbeans-6.8/swingapp/nbproject/project.properties 2009-12-04 16:35:16.000000000 +0300
+++ netbeans-6.8.new/swingapp/nbproject/project.properties 2010-01-20 18:43:33.000000000 +0300
@@ -1,6 +1,6 @@
-extra.module.files=modules/ext/appframework-1.0.3.jar,\
- docs/appframework-1.0.3-doc.zip,\
- modules/ext/swing-worker-1.1.jar
+#extra.module.files=modules/ext/appframework-1.0.3.jar,\
+# docs/appframework-1.0.3-doc.zip,\
+# modules/ext/swing-worker-1.1.jar
jnlp.indirect.jars=docs/appframework-1.0.3-doc.zip
javac.source=1.5
spec.version.base=1.7.1
netbeans-6.8~60-nosvnkit.patch:
SvnClientAdapterFactory.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- NEW FILE netbeans-6.8~60-nosvnkit.patch ---
diff -Nur netbeans-6.7.1/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java netbeans-6.7.1.new/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java
--- netbeans-6.7.1/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java 2009-08-05 00:31:45.000000000 +0400
+++ netbeans-6.7.1.new/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java 2009-08-06 22:41:34.000000000 +0400
@@ -45,7 +45,6 @@
import org.tigris.subversion.svnclientadapter.SVNClientException;
import org.tigris.subversion.svnclientadapter.javahl.JhlClientAdapter;
import org.tigris.subversion.svnclientadapter.javahl.JhlClientAdapterFactory;
-import org.tigris.subversion.svnclientadapter.svnkit.SvnKitClientAdapterFactory;
/**
*
@@ -98,8 +97,7 @@
return JhlClientAdapterFactory.isAvailable();
}
case svnkit: {
- SvnKitClientAdapterFactory.setup();
- return SvnKitClientAdapterFactory.isAvailable();
+ return false;
}
}
return false;
@@ -111,7 +109,7 @@
return JhlClientAdapterFactory.createSVNClient(JhlClientAdapterFactory.JAVAHL_CLIENT);
}
case svnkit: {
- return SvnKitClientAdapterFactory.createSVNClient(SvnKitClientAdapterFactory.SVNKIT_CLIENT); //provider.createClient();
+ return null;
}
}
return null;
netbeans-6.8~70-small-ide-cluster.patch:
apisupport.kit/nbproject/project.xml | 13 -------------
editor.kit/nbproject/project.xml | 28 ----------------------------
form.kit/nbproject/project.xml | 13 -------------
ide.kit/nbproject/project.xml | 7 -------
java.kit/nbproject/project.xml | 20 --------------------
5 files changed, 81 deletions(-)
--- NEW FILE netbeans-6.8~70-small-ide-cluster.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/apisupport.kit/nbproject/project.xml netbeans-6.8.new/apisupport.kit/nbproject/project.xml
--- netbeans-6.8/apisupport.kit/nbproject/project.xml 2010-01-21 19:38:33.000000000 +0300
+++ netbeans-6.8.new/apisupport.kit/nbproject/project.xml 2010-01-21 19:44:53.000000000 +0300
@@ -12,13 +12,6 @@
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.netbeans.modules.apisupport.feedreader</code-name-base>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.4</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
<code-name-base>org.netbeans.modules.apisupport.harness</code-name-base>
<run-dependency>
<specification-version>1.10</specification-version>
@@ -31,12 +24,6 @@
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.netbeans.modules.apisupport.paintapp</code-name-base>
- <run-dependency>
- <specification-version>1.1</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
<code-name-base>org.netbeans.modules.apisupport.project</code-name-base>
<run-dependency>
<specification-version>1.16</specification-version>
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/editor.kit/nbproject/project.xml netbeans-6.8.new/editor.kit/nbproject/project.xml
--- netbeans-6.8/editor.kit/nbproject/project.xml 2010-01-21 19:38:33.000000000 +0300
+++ netbeans-6.8.new/editor.kit/nbproject/project.xml 2010-01-21 19:45:58.000000000 +0300
@@ -6,13 +6,6 @@
<code-name-base>org.netbeans.modules.editor.kit</code-name-base>
<module-dependencies>
<dependency>
- <code-name-base>org.netbeans.modules.css.visual</code-name-base>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>2.4</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
<code-name-base>org.netbeans.modules.editor.actions</code-name-base>
<run-dependency>
<release-version>1</release-version>
@@ -41,13 +34,6 @@
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.netbeans.modules.javascript.kit</code-name-base>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>0.103</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
<code-name-base>org.netbeans.modules.languages.diff</code-name-base>
<run-dependency>
<specification-version>1.4</specification-version>
@@ -86,13 +72,6 @@
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.netbeans.modules.web.flyingsaucer</code-name-base>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
<code-name-base>org.netbeans.modules.xml.core</code-name-base>
<run-dependency>
<release-version>2</release-version>
@@ -125,13 +104,6 @@
<specification-version>1.13</specification-version>
</run-dependency>
</dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.xsl</code-name-base>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.13</specification-version>
- </run-dependency>
- </dependency>
</module-dependencies>
<public-packages/>
</data>
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/form.kit/nbproject/project.xml netbeans-6.8.new/form.kit/nbproject/project.xml
--- netbeans-6.8/form.kit/nbproject/project.xml 2010-01-21 19:38:33.000000000 +0300
+++ netbeans-6.8.new/form.kit/nbproject/project.xml 2010-01-21 19:44:53.000000000 +0300
@@ -13,13 +13,6 @@
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.netbeans.modules.form.j2ee</code-name-base>
- <run-dependency>
- <release-version>0</release-version>
- <specification-version>0.1</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
<code-name-base>org.netbeans.modules.i18n.form</code-name-base>
<run-dependency>
<release-version>2</release-version>
@@ -27,12 +20,6 @@
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.netbeans.modules.j2ee.persistence.kit</code-name-base>
- <run-dependency>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
<code-name-base>org.netbeans.modules.java.kit</code-name-base>
<run-dependency>
<specification-version>1.0</specification-version>
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/ide.kit/nbproject/project.xml netbeans-6.8.new/ide.kit/nbproject/project.xml
--- netbeans-6.8/ide.kit/nbproject/project.xml 2010-01-21 19:38:33.000000000 +0300
+++ netbeans-6.8.new/ide.kit/nbproject/project.xml 2010-01-21 19:44:53.000000000 +0300
@@ -130,13 +130,6 @@
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.netbeans.modules.httpserver</code-name-base>
- <run-dependency>
- <release-version>2</release-version>
- <specification-version>2.7</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
<code-name-base>org.netbeans.modules.jumpto</code-name-base>
<run-dependency>
<release-version>1</release-version>
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/java.kit/nbproject/project.xml netbeans-6.8.new/java.kit/nbproject/project.xml
--- netbeans-6.8/java.kit/nbproject/project.xml 2010-01-21 19:38:33.000000000 +0300
+++ netbeans-6.8.new/java.kit/nbproject/project.xml 2010-01-21 19:44:53.000000000 +0300
@@ -192,31 +192,11 @@
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.netbeans.modules.websvc.jaxws21</code-name-base>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.1</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.websvc.jaxws21api</code-name-base>
- <run-dependency>
- <release-version>1</release-version>
- </run-dependency>
- </dependency>
- <dependency>
<code-name-base>org.netbeans.modules.xml.tools.java</code-name-base>
<run-dependency>
<specification-version>1.3</specification-version>
</run-dependency>
</dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.xml.jaxb</code-name-base>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
</module-dependencies>
<test-dependencies>
<test-type>
netbeans-6.8~71-cluster-properties.patch:
cluster.properties | 83 +----------------------------------------------------
1 file changed, 3 insertions(+), 80 deletions(-)
--- NEW FILE netbeans-6.8~71-cluster-properties.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.8/nbbuild/cluster.properties netbeans-6.8.new/nbbuild/cluster.properties
--- netbeans-6.8/nbbuild/cluster.properties 2010-01-21 17:18:56.000000000 +0300
+++ netbeans-6.8.new/nbbuild/cluster.properties 2010-01-21 19:01:33.000000000 +0300
@@ -108,9 +108,7 @@
clusters.config.java.list=\
${clusters.config.platform.list},\
nb.cluster.ide,\
- nb.cluster.websvccommon,\
nb.cluster.java,\
- nb.cluster.profiler,\
nb.cluster.nb
clusters.config.enterprise.list=\
@@ -270,24 +268,10 @@
api.debugger,\
api.java.classpath,\
api.xml,\
- bugtracking,\
- bugtracking.bridge,\
- bugzilla,\
core.browser,\
core.ide,\
csl.api,\
css.editor,\
- css.visual,\
- db,\
- db.core,\
- db.dataview,\
- db.drivers,\
- db.kit,\
- db.metadata.model,\
- db.mysql,\
- db.sql.editor,\
- db.sql.visualeditor,\
- dbapi,\
defaults,\
diff,\
editor,\
@@ -315,7 +299,6 @@
editor.util,\
extbrowser,\
extexecution,\
- extexecution.destroy,\
glassfish.common,\
gototest,\
gsf,\
@@ -327,21 +310,13 @@
html.editor,\
html.editor.lib,\
html.lexer,\
- httpserver,\
hudson,\
- hudson.kenai,\
hudson.mercurial,\
hudson.subversion,\
ide.kit,\
image,\
- javascript.editing,\
- javascript.hints,\
- javascript.kit,\
- javascript.refactoring,\
jellytools.ide,\
jumpto,\
- kenai,\
- kenai.ui,\
languages,\
languages.diff,\
languages.manifest,\
@@ -350,28 +325,22 @@
lexer.editorbridge,\
lexer.nbbridge,\
lib.cvsclient,\
- libs.bugtracking,\
- libs.bugzilla,\
libs.bytelist,\
- libs.commons_codec,\
libs.commons_logging,\
libs.commons_net,\
libs.freemarker,\
libs.ini4j,\
libs.jakarta_oro,\
- libs.jaxb,\
libs.jsch,\
libs.jvyamlb,\
libs.jzlib,\
libs.lucene,\
- libs.smack,\
libs.svnClientAdapter,\
libs.swingx,\
libs.xerces,\
localhistory,\
mercurial,\
o.apache.xml.resolver,\
- o.mozilla.rhino.patched,\
o.n.swing.dirchooser,\
o.openidex.util,\
options.editor,\
@@ -396,13 +365,11 @@
spi.tasklist,\
spi.viewmodel,\
subversion,\
- swing.validation,\
target.iterator,\
tasklist.kit,\
tasklist.projectint,\
tasklist.todo,\
tasklist.ui,\
- team.kit,\
usersguide,\
utilities,\
utilities.project,\
@@ -411,12 +378,10 @@
versioning.system.cvss,\
versioning.util,\
web.client.tools.api,\
- web.flyingsaucer,\
xml,\
xml.axi,\
xml.catalog,\
xml.core,\
- xml.jaxb.api,\
xml.lexer,\
xml.multiview,\
xml.retriever,\
@@ -427,8 +392,7 @@
xml.tools,\
xml.wsdl.model,\
xml.xam,\
- xml.xdm,\
- xsl
+ xml.xdm
validation.nb.cluster.ide=\
ide.kit
@@ -436,7 +400,6 @@
nb.cluster.java.depends=\
nb.cluster.ide,\
nb.cluster.platform,\
- nb.cluster.websvccommon,\
nb.cluster.harness
nb.cluster.java=\
ant.browsetask,\
@@ -448,31 +411,19 @@
api.java,\
beans,\
classfile,\
- dbschema,\
debugger.jpda,\
debugger.jpda.ant,\
debugger.jpda.projects,\
debugger.jpda.ui,\
- derby,\
form,\
- form.j2ee,\
form.kit,\
- hibernate,\
- hibernatelib,\
hudson.ant,\
- hudson.maven,\
i18n,\
i18n.form,\
j2ee.core.utilities,\
- j2ee.eclipselink,\
- j2ee.jpa.refactoring,\
- j2ee.jpa.verification,\
j2ee.metadata,\
j2ee.metadata.model.support,\
- j2ee.persistence,\
- j2ee.persistence.kit,\
j2ee.persistenceapi,\
- j2ee.toplinklib,\
java.api.common,\
java.debug,\
java.editor,\
@@ -498,35 +449,14 @@
jellytools,\
jellytools.java,\
junit,\
- kenai.maven,\
- libs.cglib,\
libs.javacapi,\
libs.javacimpl,\
- libs.springframework,\
- maven,\
- maven.embedder,\
- maven.grammar,\
- maven.graph,\
- maven.hints,\
- maven.indexer,\
- maven.junit,\
- maven.kit,\
- maven.model,\
- maven.persistence,\
- maven.repository,\
- maven.search,\
- maven.spring,\
o.apache.tools.ant.module,\
o.jdesktop.beansbinding,\
projectimport.eclipse.core,\
projectimport.eclipse.j2se,\
refactoring.java,\
- spring.beans,\
swingapp,\
- websvc.jaxws21,\
- websvc.jaxws21api,\
- websvc.saas.codegen.java,\
- xml.jaxb,\
xml.tools.java
validation.nb.cluster.java=\
java.kit
@@ -570,12 +500,9 @@
nb.cluster.harness
nb.cluster.apisupport=\
apisupport.ant,\
- apisupport.feedreader,\
apisupport.kit,\
- apisupport.paintapp,\
apisupport.project,\
- apisupport.refactoring,\
- maven.apisupport
+ apisupport.refactoring
nb.cluster.enterprise.dir=enterprise6
nb.cluster.enterprise.depends=\
@@ -1358,21 +1285,17 @@
nb.cluster.platform
nb.cluster.websvccommon=\
websvc.jaxwsmodelapi,\
- websvc.saas.api,\
- websvc.saas.codegen,\
websvc.saas.kit,\
websvc.saas.services.amazon,\
websvc.saas.services.delicious,\
websvc.saas.services.facebook,\
websvc.saas.services.flickr,\
websvc.saas.services.google,\
- websvc.saas.services.strikeiron,\
websvc.saas.services.twitter,\
websvc.saas.services.weatherbug,\
websvc.saas.services.yahoo,\
websvc.saas.services.zillow,\
- websvc.saas.services.zvents,\
- websvc.saas.ui
+ websvc.saas.services.zvents
nb.cluster.javacard.dir=javacard1
nb.cluster.javacard.depends=\
netbeans-6.8~80-check-modules.patch:
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE netbeans-6.8~80-check-modules.patch ---
diff -Nur netbeans-6.8/nbbuild/build.xml netbeans-6.8.new/nbbuild/build.xml
--- netbeans-6.8/nbbuild/build.xml 2009-12-05 05:01:11.000000000 +0300
+++ netbeans-6.8.new/nbbuild/build.xml 2009-12-05 07:00:18.130920826 +0300
@@ -135,7 +135,7 @@
<resolve name="fixedmodules" value="config.fixedmodules.${moduleconfig}"/>
<property name="allmodules" value="${fixedmodules},${modules}"/>
<taskdef name="checkmoduleconfigs" classname="org.netbeans.nbbuild.CheckModuleConfigs" classpath="nbantext.jar"/>
- <checkmoduleconfigs nbroot=".."/>
+ <!-- checkmoduleconfigs nbroot=".."/-->
</target>
<target name="init" depends="init-module-list,set-buildnumber,init-tasks">
netbeans-6.8~90-copy_license.patch:
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE netbeans-6.8~90-copy_license.patch ---
diff -Nur netbeans-6.7.1/o.n.upgrader/build.xml netbeans-6.7.1.new/o.n.upgrader/build.xml
--- netbeans-6.7.1/o.n.upgrader/build.xml 2009-07-23 02:39:14.000000000 +0400
+++ netbeans-6.7.1.new/o.n.upgrader/build.xml 2009-08-12 19:42:25.000000000 +0400
@@ -46,7 +46,7 @@
<target name="compile" depends="projectized-common.compile">
<echo message="${build.classes.dir}"/>
<copy file="../ide.branding/release-toplevel/LICENSE.txt"
- tofile="${build.classes.dir}/org/netbeans/license/LICENSE.txt" failonerror="true"/>
+ tofile="${build.classes.dir}/org/netbeans/license/LICENSE.txt" failonerror="false"/>
</target>
<import file="../nbbuild/templates/projectized.xml"/>
netbeans-6.8~99-jruby_deps.patch:
editor.kit/nbproject/project.xml | 6 ------
nbbuild/cluster.properties | 3 ---
2 files changed, 9 deletions(-)
--- NEW FILE netbeans-6.8~99-jruby_deps.patch ---
diff -Nur netbeans-6.8/editor.kit/nbproject/project.xml netbeans-6.8.new/editor.kit/nbproject/project.xml
--- netbeans-6.8/editor.kit/nbproject/project.xml 2010-02-06 16:52:43.000000000 +0300
+++ netbeans-6.8.new/editor.kit/nbproject/project.xml 2010-02-06 18:27:46.295250673 +0300
@@ -46,12 +46,6 @@
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.netbeans.modules.languages.yaml</code-name-base>
- <run-dependency>
- <specification-version>2.1</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
<code-name-base>org.netbeans.modules.parsing.api</code-name-base>
<run-dependency>
<release-version>1</release-version>
diff -Nur netbeans-6.8/nbbuild/cluster.properties netbeans-6.8.new/nbbuild/cluster.properties
--- netbeans-6.8/nbbuild/cluster.properties 2010-02-06 16:34:34.000000000 +0300
+++ netbeans-6.8.new/nbbuild/cluster.properties 2010-02-06 16:45:07.622037477 +0300
@@ -320,19 +320,16 @@
languages,\
languages.diff,\
languages.manifest,\
- languages.yaml,\
lexer,\
lexer.editorbridge,\
lexer.nbbridge,\
lib.cvsclient,\
- libs.bytelist,\
libs.commons_logging,\
libs.commons_net,\
libs.freemarker,\
libs.ini4j,\
libs.jakarta_oro,\
libs.jsch,\
- libs.jvyamlb,\
libs.jzlib,\
libs.lucene,\
libs.svnClientAdapter,\
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 14 Aug 2009 08:48:51 -0000 1.4
+++ .cvsignore 7 Feb 2010 01:30:14 -0000 1.5
@@ -1 +1 @@
-netbeans-6.7.1-200907230233-base-src-linux.tar.gz
+netbeans-6.8-200912041610-src.zip
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log 14 Aug 2009 08:48:51 -0000 1.2
+++ import.log 7 Feb 2010 01:30:14 -0000 1.3
@@ -1,2 +1,3 @@
netbeans-6_1-4_fc10:HEAD:netbeans-6.1-4.fc10.src.rpm:1221007047
netbeans-6_7_1-1_fc12:HEAD:netbeans-6.7.1-1.fc12.src.rpm:1250240039
+netbeans-6_8-2_fc13:HEAD:netbeans-6.8-2.fc13.src.rpm:1265505720
Index: netbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/netbeans.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- netbeans.spec 14 Aug 2009 08:48:53 -0000 1.12
+++ netbeans.spec 7 Feb 2010 01:30:16 -0000 1.13
@@ -5,14 +5,14 @@
%define nb_ netbeans
%define nb_org %{nb_}.org
-%define nb_ver_major 6.7
-%define nb_ver %{nb_ver_major}.1
+%define nb_ver_major 6.8
+%define nb_ver %{nb_ver_major}
%define nb_alt_priority 670
%define nb_release_time 200907230233
%define nb_home %{_datadir}/%{nb_}
%define nb_dir %{nb_home}/%{nb_ver}
-%define nb_platform_ver 10
+%define nb_platform_ver 11
%define nb_platform platform%{nb_platform_ver}
%define nb_platform_dir %{nb_home}/%{nb_platform}
%define nb_platform_pkg %{nb_}-platform
@@ -21,20 +21,23 @@
%define nb_harness_dir %{nb_home}/%{nb_harness}
%define nb_harness_pkg %{nb_platform_pkg}-%{nb_harness}
-%define nb_ide_ver 11
-%define nb_ide ide%{nb_ide_ver}
+%define nb_ide_ver 12
+%define nb_ide_ ide
+%define nb_ide %{nb_ide_}%{nb_ide_ver}
%define nb_ide_dir %{nb_home}/%{nb_ide}
-%define nb_ide_pkg %{nb_}-%{nb_ide}
+%define nb_ide_pkg %{nb_}-%{nb_ide_}
-%define nb_java_ver 2
-%define nb_java java%{nb_java_ver}
+%define nb_java_ver 3
+%define nb_java_ java
+%define nb_java %{nb_java_}%{nb_java_ver}
%define nb_java_dir %{nb_home}/%{nb_java}
-%define nb_java_pkg %{nb_}-%{nb_java}
+%define nb_java_pkg %{nb_}-%{nb_java_}
%define nb_apisupport_ver 1
-%define nb_apisupport apisupport%{nb_apisupport_ver}
+%define nb_apisupport_ apisupport
+%define nb_apisupport %{nb_apisupport_}%{nb_apisupport_ver}
%define nb_apisupport_dir %{nb_home}/%{nb_apisupport}
-%define nb_apisupport_pkg %{nb_}-%{nb_apisupport}
+%define nb_apisupport_pkg %{nb_}-%{nb_apisupport_}
%define nb_nb nb%{nb_ver_major}
%define nb_nb_dir %{nb_dir}/%{nb_nb}
@@ -60,7 +63,7 @@
%define compiler_opt -Dbuild.compiler.deprecation=false -Dbuild.compiler.debug=false
%define jdk_opt -Dpermit.jdk6.builds=true
%define verify_opt -Dverify.checkout=false
-%define ant_nb_opt %{ant} %{jdk_opt} %{compiler_opt} %{verify_opt}
+%define ant_nb_opt %{ant} -v %{jdk_opt} %{compiler_opt} %{verify_opt}
# Layout defined by ant-1.7.0-1jpp.4.fc9.rpm
%define ant_bin_dir /usr/bin
@@ -70,12 +73,14 @@
# Used xml resolver
%define xml_resolver netbeans-resolver
-%define xml_resolver_ver %{nb_ver}
+# TODO %define xml_resolver_ver %{nb_ver}
+%define xml_resolver_ver 6.7.1
%define xml_resolver_jar %{xml_resolver}-%{xml_resolver_ver}.jar
# Used svn client adapter
%define svnclientadapter netbeans-svnclientadapter
-%define svnclientadapter_ver %{nb_ver}
+# TODO %define svnclientadapter_ver %{nb_ver}
+%define svnclientadapter_ver 6.7.1
%define svnclientadapter_jar %{svnclientadapter}.jar
%define javaparser_ver %{nb_ver}
@@ -91,35 +96,39 @@
# Links the system JAR
# %1 - the sys jar name
# %2 - the symlink
-%define lnSysJAR() %{__ln_s} -f %{_javadir}/%{1} %{2} ;
+%global lnSysJAR() if [ -f %{_javadir}/%{1} ] ; then %__ln_s -f %{_javadir}/%{*} ; else echo "%{1} doesn't exist." ; exit 1 ; fi ; \
+
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
Vendor: netbeans.org
URL: http://www.netbeans.org
+# TODO:
# A lite tarball configured and released for Linux distributions is used instead of the full source archive
# http://download.netbeans.org/%{nb_}/%{nb_ver}/final/zip/%{nb_}-%{nb_ver}-%{nb_release_time}-src.zip
# The tarball contains only modules of the basic cluster that are being packaged.
# Unused source files and all binary files are removed.
-Source0: http://nbi.netbeans.org/files/documents/210/2537/%{nb_}-%{nb_ver}-%{nb_release_time}-%{cluster}-src-linux.tar.gz
+# Source0: http://nbi.netbeans.org/files/documents/210/2537/%{nb_}-%{nb_ver}-%{nb_release_time}-%{cluster}-src-linux.tar.gz
+#
+# Until the tarboll is not ready the original zip is used: MD5: 1b085b82e04788beaf245859f818dcad
+Source0: http://download.netbeans.org/netbeans/6.8/final/zip/netbeans-6.8-200912041610-src.zip
Source1: %{name}-ide.desktop-template
%define nb_desktop_template %{SOURCE1}
# Enables the Update Center (UC) for Fedora
-Patch0: %{name}-%{version}@00-updatecenters.patch
+Patch0: %{name}-%{version}~00-updatecenters.patch
# Removes actions against binary files
-Patch1: %{name}-%{version}@10-ant-patch.patch
-# Makes org/netbeans/nbbuild/ParseProjectXml.java happy
-# even if a classpath entry (jar) does not exist
-Patch2: %{name}-%{version}@20-parse-project-xml.patch
+Patch1: %{name}-%{version}~10-ant-patch.patch
+# Removes KenaiAction from the welcome page
+Patch2: %{name}-%{version}~20-welcome.patch
# Removes windows components
-Patch3: %{name}-%{version}@30-build-xml.patch
+Patch3: %{name}-%{version}~30-build-xml.patch
# Adapts IDE launcher for Fedora
# - unset DESKTOP_STARTUP_ID
# - set progdir
@@ -128,18 +137,22 @@ Patch3: %{name}-%{version}@30-build-xml.
# http://wiki.netbeans.org/Fedora10PackagingNBIDELauncher
# https://bugzilla.redhat.com/show_bug.cgi?id=464820
# https://bugzilla.redhat.com/show_bug.cgi?id=467546
-Patch4: %{name}-%{version}@40-ide-launcher.patch
+Patch4: %{name}-%{version}~40-ide-launcher.patch
# Avoids releasing binary files
-Patch5: %{name}-%{version}@50-build-copy.patch
+Patch5: %{name}-%{version}~50-build-copy.patch
# Avoids using svnkit
-Patch6: %{name}-%{version}@60-nosvnkit.patch
+Patch6: %{name}-%{version}~60-nosvnkit.patch
# Sets up IDE configuration
-Patch7: %{name}-%{version}@70-small-ide-cluster.patch
+Patch7: %{name}-%{version}~70-small-ide-cluster.patch
+Patch8: %{name}-%{version}~71-cluster-properties.patch
+
# Disables the checkmoduleconfigs task
-Patch8: %{name}-%{version}@80-check-modules.patch
+Patch9: %{name}-%{version}~80-check-modules.patch
# Avoids failonerror during copying license file.
# The file is moved to the top directory of the tarball.
-Patch9: %{name}-%{version}@90-copy_license.patch
+Patch10: %{name}-%{version}~90-copy_license.patch
+# TODO jruby
+Patch11: %{name}-%{version}~99-jruby_deps.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -150,12 +163,17 @@ BuildRequires: ant >= 0:1.7.0
BuildRequires: ant-junit >= 0:1.7.0
BuildRequires: ant-nodeps >= 0:1.7.0
BuildRequires: ant-trax >= 0:1.7.0
+# TODO jruby
+#BuildRequires: bytelist
BuildRequires: junit >= 3.8.2
BuildRequires: junit4 >= 4.5
+# TODO jruby
+#BuildRequires: jvyamlb
+BuildRequires: jzlib
BuildRequires: swing-layout >= 0:1.0
BuildRequires: javahelp2 >= 2.0.05
BuildRequires: %{nb_platform_pkg} >= %{version}
-BuildRequires: lucene >= 2.3.1
+BuildRequires: lucene >= 2.4.1
BuildRequires: unzip
BuildRequires: desktop-file-utils
BuildRequires: netbeans-javaparser >= %{javaparser_ver}
@@ -180,7 +198,7 @@ Requires: %{nb_harness_pkg} >= %{vers
Requires: %{nb_ide_pkg} >= %{version}
Requires: %{nb_java_pkg} >= %{version}
Requires: %{nb_platform_pkg} >= %{version}
-Requires: lucene >= 2.3.1
+Requires: lucene >= 2.4.1
Requires: junit >= 3.8.2
Requires: junit4 >= 4.5
@@ -194,7 +212,7 @@ user needs. Please, visit http://www.net
this open-source project.
-%package %{nb_apisupport}
+%package %{nb_apisupport_}
Summary: Common NetBeans Platform Development Related Libraries for NetBeans
Group: Development/Tools
@@ -204,13 +222,13 @@ Requires: %{nb_ide_pkg} = %{version
Requires: %{nb_java_pkg} = %{version}-%{release}
Requires: %{nb_platform_pkg} = %{version}
Requires: %{nb_harness_pkg} = %{version}
-Provides: libnb-%{nb_apisupport} = %{version}
-%description %{nb_apisupport}
+%description %{nb_apisupport_}
+The NetBeans appisupport cluster, version %{nb_apisupport_ver}.
Common libraries for development of NetBeans Platform modular extensions.
-%package %{nb_ide}
+%package %{nb_ide_}
Summary: Integrated Development Environment (IDE) Libraries for NetBeans
Group: Development/Tools
@@ -222,25 +240,31 @@ Requires: %{xml_resolver} >= %{xml_resol
Requires: ini4j
Requires: freemarker >= 2.3.8
Requires: xerces-j2 >= 2.7.1
-Requires: netbeans-svnclientadapter >= %{version}
+Requires: netbeans-svnclientadapter >= %{svnclientadapter_ver}
Requires: subversion-javahl
Requires: jakarta-commons-logging >= 1.0.4
Requires: jakarta-oro >= 2.0.8
Requires: jakarta-commons-net >= 1.4.1
+# TODO jruby
+#Requires: bytelist
+# TODO jruby
+#Requires: jvyamlb
+Requires: jzlib
# A requirement for the owner of the /usr/share/netbeans directory
Requires: %{nb_platform_pkg} >= %{version}
-%description %{nb_ide}
+%description %{nb_ide_}
+The NetBeans ide cluster, version %{nb_ide_ver}.
Common languages independent libraries for use in the IDE.
-%package %{nb_java}
+%package %{nb_java_}
Summary: Common Java Related Libraries for NetBeans
Group: Development/Tools
Requires: jpackage-utils
Requires: java >= 1:1.6.0
-Requires: %{name}-%{nb_ide} >= %{version}
+Requires: %{nb_ide_pkg} >= %{version}
Requires: java-sdk >= 1:1.6.0
Requires: netbeans-javaparser >= %{javaparser_ver}
Requires: appframework >= 1.03
@@ -252,14 +276,16 @@ Requires: ant-trax >= 1.7.0
# A requirement for the owner of the /usr/share/netbeans directory
Requires: %{nb_platform_pkg} >= %{version}
-%description %{nb_java}
+%description %{nb_java_}
+The NetBeans java cluster, version %{nb_java_ver}.
Common libraries for the NetBeans Java IDE.
%prep
-%setup -q
+%setup -q -c
find . -type f \( -iname "*.jar" -o -iname "*.zip" \) -print0 | xargs -t -0 %{__rm} -f
find . -type f \( -iname "binaries-list" \) | xargs -t %{__rm} -f
+find . -type f \( -iname "*.ser" \) -print0 | xargs -t -0 %{__rm} -f
# To build the netbeans modules the installed jars will be used instead of pre-packaged ones
# - javahelp2.jar is required for the build target "bootstrap" for "JavaHelp indexing".
@@ -280,39 +306,51 @@ find . -type f \( -iname "binaries-list"
%patch7 -p1 -b .sav
%patch8 -p1 -b .sav
%patch9 -p1 -b .sav
+%patch10 -p1 -b .sav
+# TODO jruby
+%patch11 -p1 -b .sav11
%build
mkdir -p nbbuild/netbeans
%{__ln_s} -f %{nb_platform_dir} nbbuild/netbeans/%{nb_platform}
%{__ln_s} -f %{nb_harness_dir} nbbuild/netbeans/harness
+touch nbbuild/netbeans/nb.cluster.harness.built
+touch nbbuild/netbeans/nb.cluster.platform.built
IDE_EXT_DIR=nbbuild/netbeans/%{nb_ide}/modules/ext
%{__mkdir_p} ${IDE_EXT_DIR}
%lnSysJAR jsch.jar ${IDE_EXT_DIR}/jsch-0.1.41.jar
%lnSysJAR %{xml_resolver_jar} ${IDE_EXT_DIR}/resolver-1.2.jar
%lnSysJAR ini4j.jar ${IDE_EXT_DIR}/ini4j-%{ini4j_ver}.jar
+
# The freemarker 2.2 isn't compatible with 2.3. It means that future versions can be incompatible too.
# Therefore, we must use the freemarker-2.3.jar link instead of freemarker.jar
%lnSysJAR freemarker-2.3.jar ${IDE_EXT_DIR}/freemarker-2.3.8.jar
%lnSysJAR %{svnclientadapter_jar} ${IDE_EXT_DIR}/svnClientAdapter-1.6.0.jar
%lnSysJAR svn-javahl.jar ${IDE_EXT_DIR}/svnjavahl-%{svnjavahl_ver}.jar
%lnSysJAR xerces-j2.jar ${IDE_EXT_DIR}/xerces-2.8.0.jar
-%lnSysJAR lucene.jar ${IDE_EXT_DIR}/lucene-core-2.3.2.jar
+%lnSysJAR lucene.jar ${IDE_EXT_DIR}/lucene-core-2.4.1.jar
%lnSysJAR commons-logging.jar ${IDE_EXT_DIR}/commons-logging-%{commons_logging_ver}.jar
%lnSysJAR jakarta-oro.jar ${IDE_EXT_DIR}/jakarta-oro-2.0.8.jar
%lnSysJAR commons-net.jar ${IDE_EXT_DIR}/commons-net-1.4.1.jar
+%lnSysJAR jzlib.jar ${IDE_EXT_DIR}/jzlib-1.0.7.jar
+
+# TODO jruby
+# %lnSysJAR bytelist.jar ${IDE_EXT_DIR}/bytelist-0.1.jar
+# %lnSysJAR jvyamlb.jar ${IDE_EXT_DIR}/jvyamlb-0.2.3.jar
JAVA_EXT_DIR=nbbuild/netbeans/%{nb_java}/modules/ext
%{__mkdir_p} ${JAVA_EXT_DIR}
-%lnSysJAR netbeans-javaparser-api-%{version}.jar ${JAVA_EXT_DIR}/javac-api-nb-7.0-b07.jar
-%lnSysJAR netbeans-javaparser-impl-%{version}.jar ${JAVA_EXT_DIR}/javac-impl-nb-7.0-b07.jar
+%lnSysJAR netbeans-javaparser-api.jar ${JAVA_EXT_DIR}/javac-api-nb-7.0-b07.jar
+%lnSysJAR netbeans-javaparser-impl.jar ${JAVA_EXT_DIR}/javac-impl-nb-7.0-b07.jar
%lnSysJAR appframework.jar ${JAVA_EXT_DIR}/appframework-1.0.3.jar
%lnSysJAR beansbinding.jar ${JAVA_EXT_DIR}/beansbinding-1.2.1.jar
%lnSysJAR junit.jar ${JAVA_EXT_DIR}/junit-3.8.2.jar
%{ant_nb_opt} \
-Do.n.core.dir=%{nb_platform_dir} \
+ -Ddo-not-rebuild-clusters=true \
-Dnb.cluster.platform-is-built=true \
-Dnb.cluster.harness-is-built=true \
-Dcore.dir=%{nb_platform_dir} \
@@ -337,7 +375,7 @@ sed --in-place "s|<nb_launcher>|%{nb_lau
%{__rm} -f ${IDE_EXT_DIR}/svnClientAdapter-1.6.0.jar
%{__rm} -f ${IDE_EXT_DIR}/svnjavahl-%{svnjavahl_ver}.jar
%{__rm} -f ${IDE_EXT_DIR}/xerces-2.8.0.jar
-%{__rm} -f ${IDE_EXT_DIR}/lucene-core-2.3.2.jar
+%{__rm} -f ${IDE_EXT_DIR}/lucene-core-2.4.1.jar
%{__rm} -f ${IDE_EXT_DIR}/commons-logging-%{commons_logging_ver}.jar
%{__rm} -f ${IDE_EXT_DIR}/jakarta-oro-2.0.8.jar
@@ -383,9 +421,14 @@ IDE_EXT_DIR=%{buildroot}%{nb_ide_dir}/mo
%lnSysJAR %{svnclientadapter_jar} ${IDE_EXT_DIR}/svnClientAdapter-1.6.0.jar
%lnSysJAR svn-javahl.jar ${IDE_EXT_DIR}/svnjavahl-%{svnjavahl_ver}.jar
%lnSysJAR xerces-j2.jar ${IDE_EXT_DIR}/xerces-2.8.0.jar
-%lnSysJAR lucene.jar ${IDE_EXT_DIR}/lucene-core-2.3.2.jar
+%lnSysJAR lucene.jar ${IDE_EXT_DIR}/lucene-core-2.4.1.jar
%lnSysJAR commons-logging.jar ${IDE_EXT_DIR}/commons-logging-%{commons_logging_ver}.jar
%lnSysJAR jakarta-oro.jar ${IDE_EXT_DIR}/jakarta-oro-2.0.8.jar
+%lnSysJAR jzlib.jar ${IDE_EXT_DIR}/jzlib-1.0.7.jar
+
+# TODO jruby
+# %lnSysJAR bytelist.jar ${IDE_EXT_DIR}/bytelist-0.1.jar
+# %lnSysJAR jvyamlb.jar ${IDE_EXT_DIR}/jvyamlb-0.2.3.jar
# Install java
install_package %{buildroot}%{nb_java_dir} nbbuild/netbeans/%{nb_java}/*
@@ -396,8 +439,8 @@ install -d -m 755 %{buildroot}%{nb_java_
# linking the java to the external JARs
JAVA_EXT_DIR=%{buildroot}%{nb_java_dir}/modules/ext
-%lnSysJAR netbeans-javaparser-api-%{version}.jar ${JAVA_EXT_DIR}/javac-api-nb-7.0-b07.jar
-%lnSysJAR netbeans-javaparser-impl-%{version}.jar ${JAVA_EXT_DIR}/javac-impl-nb-7.0-b07.jar
+%lnSysJAR netbeans-javaparser-api.jar ${JAVA_EXT_DIR}/javac-api-nb-7.0-b07.jar
+%lnSysJAR netbeans-javaparser-impl.jar ${JAVA_EXT_DIR}/javac-impl-nb-7.0-b07.jar
%lnSysJAR appframework.jar ${JAVA_EXT_DIR}/appframework-1.0.3.jar
%lnSysJAR beansbinding.jar ${JAVA_EXT_DIR}/beansbinding-1.2.1.jar
%lnSysJAR junit4.jar ${JAVA_EXT_DIR}/junit-4.5.jar
@@ -426,6 +469,8 @@ install_package %{buildroot}%{nb_etc_dir
%{__cp} -p nbbuild/netbeans/CREDITS.html %{buildroot}%{nb_dir}/
%{__cp} -p nbbuild/netbeans/README.html %{buildroot}%{nb_dir}/
%{__cp} -p nbbuild/netbeans/netbeans.css %{buildroot}%{nb_dir}/
+# install nb txt files
+%{__cp} -p nbbuild/netbeans/LICENSE.txt %{buildroot}%{nb_dir}/
# inistall nb/nbX.X config
echo -n "%{nb_distro_id}" > %{buildroot}%{nb_nb_config_dir}/productid
%noautoupdate %{buildroot}%{nb_nb_dir}
@@ -469,26 +514,30 @@ fi
%dir %{_datadir}/applications/%{nb_org}/
%{nb_nb_dir}/.noautoupdate
%{_datadir}/applications/%{nb_org}/%{nb_desktop}
-%doc LICENSE.txt README.txt
+%doc %{nb_dir}/LICENSE.txt
-%files %{nb_apisupport}
+%files %{nb_apisupport_}
%defattr(-,root,root,-)
%{nb_apisupport_dir}/
%{nb_apisupport_dir}/.noautoupdate
-%doc LICENSE.txt
+%doc %{nb_dir}/LICENSE.txt
-%files %{nb_ide}
+%files %{nb_ide_}
%defattr(-,root,root,-)
%{nb_ide_dir}/
%{nb_ide_dir}/.noautoupdate
-%doc LICENSE.txt
+%doc %{nb_dir}/LICENSE.txt
-%files %{nb_java}
+%files %{nb_java_}
%defattr(-,root,root,-)
%{nb_java_dir}/
%{nb_java_dir}/.noautoupdate
-%doc LICENSE.txt
+%doc %{nb_dir}/LICENSE.txt
%changelog
+* Sat Feb 06 2010 Victor Vasilyev <victor.vasilyev at sun.com> 6.8-2
+- remove dependencies on Jruby's pkgs: bytelist, jvyamlb
+* Thu Nov 26 2009 Victor Vasilyev <victor.vasilyev at sun.com> 6.8-1
+- re-base for the NetBeans 6.8
* Sat May 23 2009 Victor Vasilyev <victor.vasilyev at sun.com> 6.7.1-1
- re-base for the NetBeans 6.7.1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 14 Aug 2009 08:48:53 -0000 1.4
+++ sources 7 Feb 2010 01:30:16 -0000 1.5
@@ -1 +1 @@
-5a38c0539b82027eeea8b16ed1065e95 netbeans-6.7.1-200907230233-base-src-linux.tar.gz
+1b085b82e04788beaf245859f818dcad netbeans-6.8-200912041610-src.zip
--- netbeans-6.7.1 at 00-updatecenters.patch DELETED ---
--- netbeans-6.7.1 at 10-ant-patch.patch DELETED ---
--- netbeans-6.7.1 at 20-parse-project-xml.patch DELETED ---
--- netbeans-6.7.1 at 30-build-xml.patch DELETED ---
--- netbeans-6.7.1 at 40-ide-launcher.patch DELETED ---
--- netbeans-6.7.1 at 50-build-copy.patch DELETED ---
--- netbeans-6.7.1 at 60-nosvnkit.patch DELETED ---
--- netbeans-6.7.1 at 70-small-ide-cluster.patch DELETED ---
--- netbeans-6.7.1 at 80-check-modules.patch DELETED ---
--- netbeans-6.7.1 at 90-copy_license.patch DELETED ---
More information about the scm-commits
mailing list