rpms/netbeans/devel netbeans-6.9~00-updatecenters.patch, NONE, 1.1 netbeans-6.9~10-o.apache.tools.ant.module.patch, NONE, 1.1 netbeans-6.9~30-build-xml.patch, NONE, 1.1 netbeans-6.9~40-ide-launcher.patch, NONE, 1.1 netbeans-6.9~50-build-copy.patch, NONE, 1.1 netbeans-6.9~60-nosvnkit.patch, NONE, 1.1 netbeans-6.9~70-small-ide-cluster.patch, NONE, 1.1 netbeans-6.9~71-cluster-properties.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 import.log, 1.3, 1.4 netbeans.spec, 1.17, 1.18 sources, 1.5, 1.6 netbeans-6.8~00-updatecenters.patch, 1.1, NONE netbeans-6.8~10-ant-patch.patch, 1.1, NONE netbeans-6.8~20-welcome.patch, 1.1, NONE netbeans-6.8~30-build-xml.patch, 1.1, NONE netbeans-6.8~40-ide-launcher.patch, 1.1, NONE netbeans-6.8~50-build-copy.patch, 1.1, NONE netbeans-6.8~60-nosvnkit.patch, 1.1, NONE netbeans-6.8~70-small-ide-cluster.patch, 1.1, NONE netbeans-6.8~71-cluster-properties.patch, 1.1, NONE netbeans-6.8~80-check-modules.patch, 1.1, NONE netbeans-6.8~90-copy_license.patch, 1.1, NONE
Victor G. Vasilyev
victorv at fedoraproject.org
Tue Jul 27 04:00:29 UTC 2010
Author: victorv
Update of /cvs/pkgs/rpms/netbeans/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17932/devel
Modified Files:
.cvsignore import.log netbeans.spec sources
Added Files:
netbeans-6.9~00-updatecenters.patch
netbeans-6.9~10-o.apache.tools.ant.module.patch
netbeans-6.9~30-build-xml.patch
netbeans-6.9~40-ide-launcher.patch
netbeans-6.9~50-build-copy.patch
netbeans-6.9~60-nosvnkit.patch
netbeans-6.9~70-small-ide-cluster.patch
netbeans-6.9~71-cluster-properties.patch
Removed 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
Log Message:
Re-base to 6.9
netbeans-6.9~00-updatecenters.patch:
Bundle.properties | 2 ++
mf-layer.xml | 14 ++++++++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
--- NEW FILE netbeans-6.9~00-updatecenters.patch ---
diff -Nur netbeans-6.9/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties netbeans-6.9.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
--- netbeans-6.9/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties 2010-06-10 15:22:52.000000000 +0400
+++ netbeans-6.9.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties 2010-07-14 18:40:58.925745989 +0400
@@ -53,9 +53,11 @@
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.9/uc/final/stable/catalog.xml.gz?{$netbeans.hash.code}
URL_Beta=http://updates.netbeans.org/netbeans/updates/6.9/uc/final/beta/catalog.xml.gz?{$netbeans.hash.code}
URL_ThirdParty=http://updates.netbeans.org/netbeans/updates/6.9/uc/final/thirdparty/catalog.xml.gz?{$netbeans.hash.code}
URL_PluginPortal=http://plugins.netbeans.org/nbpluginportal/updates/6.9/catalog.xml.gz
+URL_Standard_Fedora=http://updates.netbeans.org/netbeans/updates/6.9/uc/final/fedora/catalog.xml.gz?{$netbeans.hash.code}
diff -Nur netbeans-6.9/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml netbeans-6.9.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
--- netbeans-6.9/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml 2010-06-10 15:22:52.000000000 +0400
+++ netbeans-6.9.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml 2010-07-14 18:46:41.328680735 +0400
@@ -55,7 +55,7 @@
<attr name="iconBase" stringvalue="org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
<attr name="url" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#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>
@@ -89,7 +89,17 @@
<attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider" />
<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.9~10-o.apache.tools.ant.module.patch:
build.xml | 2 ++
external/build.xml | 2 ++
2 files changed, 4 insertions(+)
--- NEW FILE netbeans-6.9~10-o.apache.tools.ant.module.patch ---
diff -Nur netbeans-6.9/o.apache.tools.ant.module/build.xml netbeans-6.9.new/o.apache.tools.ant.module/build.xml
--- netbeans-6.9/o.apache.tools.ant.module/build.xml 2010-06-10 15:20:50.000000000 +0400
+++ netbeans-6.9.new/o.apache.tools.ant.module/build.xml 2010-07-14 19:49:51.126679798 +0400
@@ -78,6 +78,7 @@
</target>
<target name="netbeans-extra" depends="jar-bridge">
+<!--
<mkdir dir="${cluster}/ant/lib"/>
<copy todir="${cluster}/ant/lib">
<fileset dir="external/lib"/>
@@ -87,6 +88,7 @@
<include name="ant-misc-*.zip"/>
</fileset>
</unzip>
+-->
</target>
<target name="test-build" depends="jar-bridge,projectized-common.test-build"/>
diff -Nur netbeans-6.9/o.apache.tools.ant.module/external/build.xml netbeans-6.9.new/o.apache.tools.ant.module/external/build.xml
--- netbeans-6.9/o.apache.tools.ant.module/external/build.xml 2010-06-10 15:20:50.000000000 +0400
+++ netbeans-6.9.new/o.apache.tools.ant.module/external/build.xml 2010-07-14 19:53:47.904672448 +0400
@@ -45,7 +45,9 @@
-->
<project name="o.apache.tools.ant.module/external" default="unzip" basedir=".">
<target name="unzip">
+<!--
<unzip src="ant-libs-1.8.0.zip" dest="lib"/>
+-->
</target>
<target name="clean">
<delete dir="lib"/>
netbeans-6.9~30-build-xml.patch:
build.xml | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE netbeans-6.9~30-build-xml.patch ---
diff -Nur netbeans-6.9/nbbuild/build.xml netbeans-6.9.new/nbbuild/build.xml
--- netbeans-6.9/nbbuild/build.xml 2010-06-10 15:20:46.000000000 +0400
+++ netbeans-6.9.new/nbbuild/build.xml 2010-07-15 15:18:04.805684320 +0400
@@ -149,7 +149,9 @@
<target name="init-module-list" depends="bootstrap,init-tasks">
<!-- Define modules. -->
+<!--
<checkmoduleconfigs nbroot=".."/>
+-->
<resolvelist name="allmodules" list="${nb.clusters.list}"/>
<pathconvert property="modules.fullpath" >
<path>
@@ -299,7 +301,9 @@
<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" />
netbeans-6.9~40-ide-launcher.patch:
netbeans | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
--- NEW FILE netbeans-6.9~40-ide-launcher.patch ---
diff -Nur netbeans-6.9/ide/launcher/unix/netbeans netbeans-6.9.new/ide/launcher/unix/netbeans
--- netbeans-6.9/ide/launcher/unix/netbeans 2010-06-10 15:19:10.000000000 +0400
+++ netbeans-6.9.new/ide/launcher/unix/netbeans 2010-07-22 04:03:54.905999281 +0400
@@ -41,6 +41,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
#
@@ -57,16 +68,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.9/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 "$@"
@@ -198,7 +211,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.9~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.9~50-build-copy.patch ---
diff -Nur netbeans-6.9/css.editor/nbproject/project.properties netbeans-6.9.new/css.editor/nbproject/project.properties
--- netbeans-6.9/css.editor/nbproject/project.properties 2010-06-10 15:18:26.000000000 +0400
+++ netbeans-6.9.new/css.editor/nbproject/project.properties 2010-07-16 05:59:44.594742595 +0400
@@ -40,7 +40,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 netbeans-6.9/html.editor/nbproject/project.properties netbeans-6.9.new/html.editor/nbproject/project.properties
--- netbeans-6.9/html.editor/nbproject/project.properties 2010-06-10 15:19:04.000000000 +0400
+++ netbeans-6.9.new/html.editor/nbproject/project.properties 2010-07-16 06:00:23.027727913 +0400
@@ -40,7 +40,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.6
diff -Nur netbeans-6.9/junit/nbproject/project.properties netbeans-6.9.new/junit/nbproject/project.properties
--- netbeans-6.9/junit/nbproject/project.properties 2010-06-10 15:20:14.000000000 +0400
+++ netbeans-6.9.new/junit/nbproject/project.properties 2010-07-16 06:01:49.883726928 +0400
@@ -45,11 +45,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.8.0-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.8.0-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 netbeans-6.9/libs.bytelist/nbproject/project.properties netbeans-6.9.new/libs.bytelist/nbproject/project.properties
--- netbeans-6.9/libs.bytelist/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400
+++ netbeans-6.9.new/libs.bytelist/nbproject/project.properties 2010-07-16 06:02:25.053954346 +0400
@@ -41,5 +41,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.7.1
diff -Nur netbeans-6.9/libs.commons_logging/nbproject/project.properties netbeans-6.9.new/libs.commons_logging/nbproject/project.properties
--- netbeans-6.9/libs.commons_logging/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400
+++ netbeans-6.9.new/libs.commons_logging/nbproject/project.properties 2010-07-16 06:03:48.899676485 +0400
@@ -41,5 +41,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.13.1
diff -Nur netbeans-6.9/libs.commons_net/nbproject/project.properties netbeans-6.9.new/libs.commons_net/nbproject/project.properties
--- netbeans-6.9/libs.commons_net/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400
+++ netbeans-6.9.new/libs.commons_net/nbproject/project.properties 2010-07-16 06:04:27.258857826 +0400
@@ -41,5 +41,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.8.1
diff -Nur netbeans-6.9/libs.freemarker/nbproject/project.properties netbeans-6.9.new/libs.freemarker/nbproject/project.properties
--- netbeans-6.9/libs.freemarker/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400
+++ netbeans-6.9.new/libs.freemarker/nbproject/project.properties 2010-07-16 06:05:34.871676824 +0400
@@ -44,6 +44,6 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.6
-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.11.1
diff -Nur netbeans-6.9/libs.ini4j/nbproject/project.properties netbeans-6.9.new/libs.ini4j/nbproject/project.properties
--- netbeans-6.9/libs.ini4j/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400
+++ netbeans-6.9.new/libs.ini4j/nbproject/project.properties 2010-07-16 06:06:19.885673929 +0400
@@ -41,7 +41,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 netbeans-6.9/libs.jakarta_oro/nbproject/project.properties netbeans-6.9.new/libs.jakarta_oro/nbproject/project.properties
--- netbeans-6.9/libs.jakarta_oro/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400
+++ netbeans-6.9.new/libs.jakarta_oro/nbproject/project.properties 2010-07-16 06:06:44.109804385 +0400
@@ -41,5 +41,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.7.1
diff -Nur netbeans-6.9/libs.javacapi/nbproject/project.properties netbeans-6.9.new/libs.javacapi/nbproject/project.properties
--- netbeans-6.9/libs.javacapi/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400
+++ netbeans-6.9.new/libs.javacapi/nbproject/project.properties 2010-07-16 06:07:35.303728982 +0400
@@ -47,6 +47,6 @@
nbm.homepage=http://jackpot.netbeans.org/
nbm.module.author=Petr Hrebejk, Sun Microsystems, Inc.
spec.version.base=0.13.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 netbeans-6.9/libs.javacimpl/nbproject/project.properties netbeans-6.9.new/libs.javacimpl/nbproject/project.properties
--- netbeans-6.9/libs.javacimpl/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400
+++ netbeans-6.9.new/libs.javacimpl/nbproject/project.properties 2010-07-16 06:08:26.597996098 +0400
@@ -44,7 +44,7 @@
nbm.homepage=http://jackpot.netbeans.org/
nbm.module.author=Petr Hrebejk, Sun Microsystems, Inc.
spec.version.base=0.16.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 netbeans-6.9/libs.jna/nbproject/project.properties netbeans-6.9.new/libs.jna/nbproject/project.properties
--- netbeans-6.9/libs.jna/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400
+++ netbeans-6.9.new/libs.jna/nbproject/project.properties 2010-07-16 06:09:14.791678998 +0400
@@ -40,4 +40,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 netbeans-6.9/libs.jsch/nbproject/project.properties netbeans-6.9.new/libs.jsch/nbproject/project.properties
--- netbeans-6.9/libs.jsch/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400
+++ netbeans-6.9.new/libs.jsch/nbproject/project.properties 2010-07-16 06:10:13.651928868 +0400
@@ -41,6 +41,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 netbeans-6.9/libs.junit4/nbproject/project.properties netbeans-6.9.new/libs.junit4/nbproject/project.properties
--- netbeans-6.9/libs.junit4/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400
+++ netbeans-6.9.new/libs.junit4/nbproject/project.properties 2010-07-16 06:10:45.703797050 +0400
@@ -41,7 +41,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 netbeans-6.9/libs.jvyamlb/nbproject/project.properties netbeans-6.9.new/libs.jvyamlb/nbproject/project.properties
--- netbeans-6.9/libs.jvyamlb/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400
+++ netbeans-6.9.new/libs.jvyamlb/nbproject/project.properties 2010-07-16 06:11:55.084698916 +0400
@@ -41,6 +41,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 netbeans-6.9/libs.jzlib/nbproject/project.properties netbeans-6.9.new/libs.jzlib/nbproject/project.properties
--- netbeans-6.9/libs.jzlib/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400
+++ netbeans-6.9.new/libs.jzlib/nbproject/project.properties 2010-07-16 06:13:06.616686401 +0400
@@ -41,6 +41,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.4.1
sigtest.gen.fail.on.error=false
diff -Nur netbeans-6.9/libs.lucene/nbproject/project.properties netbeans-6.9.new/libs.lucene/nbproject/project.properties
--- netbeans-6.9/libs.lucene/nbproject/project.properties 2010-06-10 15:20:26.000000000 +0400
+++ netbeans-6.9.new/libs.lucene/nbproject/project.properties 2010-07-16 06:14:21.604681273 +0400
@@ -41,5 +41,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.10.1
diff -Nur netbeans-6.9/libs.svnClientAdapter/nbproject/project.properties netbeans-6.9.new/libs.svnClientAdapter/nbproject/project.properties
--- netbeans-6.9/libs.svnClientAdapter/nbproject/project.properties 2010-06-10 15:20:26.000000000 +0400
+++ netbeans-6.9.new/libs.svnClientAdapter/nbproject/project.properties 2010-07-16 06:15:17.101763246 +0400
@@ -43,8 +43,8 @@
is.autoload=true
javac.source=1.6
-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 netbeans-6.9/libs.swingx/nbproject/project.properties netbeans-6.9.new/libs.swingx/nbproject/project.properties
--- netbeans-6.9/libs.swingx/nbproject/project.properties 2010-06-10 15:20:26.000000000 +0400
+++ netbeans-6.9.new/libs.swingx/nbproject/project.properties 2010-07-16 06:17:30.875793234 +0400
@@ -40,6 +40,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 netbeans-6.9/libs.xerces/nbproject/project.properties netbeans-6.9.new/libs.xerces/nbproject/project.properties
--- netbeans-6.9/libs.xerces/nbproject/project.properties 2010-06-10 15:20:26.000000000 +0400
+++ netbeans-6.9.new/libs.xerces/nbproject/project.properties 2010-07-16 06:17:59.308937253 +0400
@@ -41,6 +41,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.18.1
diff -Nur netbeans-6.9/o.apache.xml.resolver/nbproject/project.properties netbeans-6.9.new/o.apache.xml.resolver/nbproject/project.properties
--- netbeans-6.9/o.apache.xml.resolver/nbproject/project.properties 2010-06-10 15:20:50.000000000 +0400
+++ netbeans-6.9.new/o.apache.xml.resolver/nbproject/project.properties 2010-07-16 06:18:37.024719810 +0400
@@ -41,5 +41,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.11.1
diff -Nur netbeans-6.9/o.jdesktop.beansbinding/nbproject/project.properties netbeans-6.9.new/o.jdesktop.beansbinding/nbproject/project.properties
--- netbeans-6.9/o.jdesktop.beansbinding/nbproject/project.properties 2010-06-10 15:20:50.000000000 +0400
+++ netbeans-6.9.new/o.jdesktop.beansbinding/nbproject/project.properties 2010-07-16 06:19:29.208734667 +0400
@@ -41,7 +41,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.7.1
diff -Nur netbeans-6.9/o.jdesktop.layout/nbproject/project.properties netbeans-6.9.new/o.jdesktop.layout/nbproject/project.properties
--- netbeans-6.9/o.jdesktop.layout/nbproject/project.properties 2010-06-10 15:20:50.000000000 +0400
+++ netbeans-6.9.new/o.jdesktop.layout/nbproject/project.properties 2010-07-16 06:20:31.435815424 +0400
@@ -41,7 +41,7 @@
# 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
diff -Nur netbeans-6.9/servletapi/nbproject/project.properties netbeans-6.9.new/servletapi/nbproject/project.properties
--- netbeans-6.9/servletapi/nbproject/project.properties 2010-06-10 15:22:08.000000000 +0400
+++ netbeans-6.9.new/servletapi/nbproject/project.properties 2010-07-16 06:21:11.095676854 +0400
@@ -41,4 +41,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 netbeans-6.9/swingapp/nbproject/project.properties netbeans-6.9.new/swingapp/nbproject/project.properties
--- netbeans-6.9/swingapp/nbproject/project.properties 2010-06-10 15:22:26.000000000 +0400
+++ netbeans-6.9.new/swingapp/nbproject/project.properties 2010-07-16 06:22:04.988688029 +0400
@@ -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.6
spec.version.base=1.9.1
netbeans-6.9~60-nosvnkit.patch:
SvnClientAdapterFactory.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
--- NEW FILE netbeans-6.9~60-nosvnkit.patch ---
diff -Nur netbeans-6.9/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java netbeans-6.9.new/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java
--- netbeans-6.9/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java 2010-06-10 15:20:26.000000000 +0400
+++ netbeans-6.9.new/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java 2010-07-20 06:58:22.586364869 +0400
@@ -48,7 +48,7 @@
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;
+//import org.tigris.subversion.svnclientadapter.svnkit.SvnKitClientAdapterFactory;
/**
*
@@ -101,8 +101,9 @@
return JhlClientAdapterFactory.isAvailable();
}
case svnkit: {
- SvnKitClientAdapterFactory.setup();
- return SvnKitClientAdapterFactory.isAvailable();
+// SvnKitClientAdapterFactory.setup();
+// return SvnKitClientAdapterFactory.isAvailable();
+ return false;
}
}
return false;
@@ -114,7 +115,8 @@
return JhlClientAdapterFactory.createSVNClient(JhlClientAdapterFactory.JAVAHL_CLIENT);
}
case svnkit: {
- return SvnKitClientAdapterFactory.createSVNClient(SvnKitClientAdapterFactory.SVNKIT_CLIENT);
+// return SvnKitClientAdapterFactory.createSVNClient(SvnKitClientAdapterFactory.SVNKIT_CLIENT);
+ return null;
}
}
return null;
netbeans-6.9~70-small-ide-cluster.patch:
apisupport.kit/nbproject/project.xml | 4 ++++
editor.kit/nbproject/project.xml | 8 ++++++++
ide.kit/nbproject/project.xml | 4 ++++
java.kit/nbproject/project.xml | 2 ++
4 files changed, 18 insertions(+)
--- NEW FILE netbeans-6.9~70-small-ide-cluster.patch ---
diff -Nur netbeans-6.9/apisupport.kit/nbproject/project.xml netbeans-6.9.new/apisupport.kit/nbproject/project.xml
--- netbeans-6.9/apisupport.kit/nbproject/project.xml 2010-06-10 15:17:40.000000000 +0400
+++ netbeans-6.9.new/apisupport.kit/nbproject/project.xml 2010-07-21 02:07:58.999356131 +0400
@@ -11,6 +11,7 @@
<specification-version>2.31</specification-version>
</run-dependency>
</dependency>
+<!--
<dependency>
<code-name-base>org.netbeans.modules.apisupport.crudsample</code-name-base>
<run-dependency>
@@ -24,6 +25,7 @@
<specification-version>1.4</specification-version>
</run-dependency>
</dependency>
+-->
<dependency>
<code-name-base>org.netbeans.modules.apisupport.harness</code-name-base>
<run-dependency>
@@ -42,12 +44,14 @@
<specification-version>1.1</specification-version>
</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>
diff -Nur netbeans-6.9/editor.kit/nbproject/project.xml netbeans-6.9.new/editor.kit/nbproject/project.xml
--- netbeans-6.9/editor.kit/nbproject/project.xml 2010-06-10 15:18:42.000000000 +0400
+++ netbeans-6.9.new/editor.kit/nbproject/project.xml 2010-07-16 15:59:37.418687474 +0400
@@ -5,6 +5,7 @@
<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
<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>
@@ -12,6 +13,7 @@
<specification-version>2.4</specification-version>
</run-dependency>
</dependency>
+-->
<dependency>
<code-name-base>org.netbeans.modules.editor.actions</code-name-base>
<run-dependency>
@@ -40,6 +42,7 @@
<specification-version>1.19</specification-version>
</run-dependency>
</dependency>
+<!--
<dependency>
<code-name-base>org.netbeans.modules.javascript.kit</code-name-base>
<run-dependency>
@@ -47,6 +50,7 @@
<specification-version>0.103</specification-version>
</run-dependency>
</dependency>
+-->
<dependency>
<code-name-base>org.netbeans.modules.languages.diff</code-name-base>
<run-dependency>
@@ -79,6 +83,7 @@
<specification-version>1.21</specification-version>
</run-dependency>
</dependency>
+<!--
<dependency>
<code-name-base>org.netbeans.modules.web.flyingsaucer</code-name-base>
<run-dependency>
@@ -86,6 +91,7 @@
<specification-version>1</specification-version>
</run-dependency>
</dependency>
+-->
<dependency>
<code-name-base>org.netbeans.modules.xml.core</code-name-base>
<run-dependency>
@@ -119,6 +125,7 @@
<specification-version>1.13</specification-version>
</run-dependency>
</dependency>
+<!--
<dependency>
<code-name-base>org.netbeans.modules.xsl</code-name-base>
<run-dependency>
@@ -126,6 +133,7 @@
<specification-version>1.13</specification-version>
</run-dependency>
</dependency>
+-->
</module-dependencies>
<public-packages/>
</data>
diff -Nur netbeans-6.9/ide.kit/nbproject/project.xml netbeans-6.9.new/ide.kit/nbproject/project.xml
--- netbeans-6.9/ide.kit/nbproject/project.xml 2010-06-10 15:19:10.000000000 +0400
+++ netbeans-6.9.new/ide.kit/nbproject/project.xml 2010-07-21 04:51:25.244350718 +0400
@@ -129,6 +129,7 @@
<specification-version>1.11</specification-version>
</run-dependency>
</dependency>
+<!--
<dependency>
<code-name-base>org.netbeans.modules.httpserver</code-name-base>
<run-dependency>
@@ -136,6 +137,7 @@
<specification-version>2.7</specification-version>
</run-dependency>
</dependency>
+-->
<dependency>
<code-name-base>org.netbeans.modules.jumpto</code-name-base>
<run-dependency>
@@ -222,12 +224,14 @@
<specification-version>1.0</specification-version>
</run-dependency>
</dependency>
+<!--
<dependency>
<code-name-base>org.netbeans.modules.dlight.terminal</code-name-base>
<run-dependency>
<specification-version>1.0</specification-version>
</run-dependency>
</dependency>
+-->
</module-dependencies>
<test-dependencies>
<test-type>
diff -Nur netbeans-6.9/java.kit/nbproject/project.xml netbeans-6.9.new/java.kit/nbproject/project.xml
--- netbeans-6.9/java.kit/nbproject/project.xml 2010-06-10 15:19:56.000000000 +0400
+++ netbeans-6.9.new/java.kit/nbproject/project.xml 2010-07-16 16:04:08.390684786 +0400
@@ -204,6 +204,7 @@
<specification-version>1.8</specification-version>
</run-dependency>
</dependency>
+<!--
<dependency>
<code-name-base>org.netbeans.modules.websvc.jaxws21</code-name-base>
<run-dependency>
@@ -224,6 +225,7 @@
<specification-version>1.0</specification-version>
</run-dependency>
</dependency>
+-->
<dependency>
<code-name-base>org.netbeans.modules.xml.tools.java</code-name-base>
<run-dependency>
netbeans-6.9~71-cluster-properties.patch:
cluster.properties | 87 +----------------------------------------------------
1 file changed, 2 insertions(+), 85 deletions(-)
--- NEW FILE netbeans-6.9~71-cluster-properties.patch ---
diff -Nur netbeans-6.9/nbbuild/cluster.properties netbeans-6.9.new/nbbuild/cluster.properties
--- netbeans-6.9/nbbuild/cluster.properties 2010-06-10 15:20:46.000000000 +0400
+++ netbeans-6.9.new/nbbuild/cluster.properties 2010-07-21 04:57:01.709344046 +0400
@@ -112,9 +112,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=\
@@ -275,30 +273,12 @@
api.debugger,\
api.java.classpath,\
api.xml,\
- bugtracking,\
- bugtracking.bridge,\
- bugtracking.kenai,\
- 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,\
- derby,\
diff,\
- dlight.nativeexecution,\
- dlight.terminal,\
editor,\
editor.actions,\
editor.bookmarks,\
@@ -324,8 +304,6 @@
editor.util,\
extbrowser,\
extexecution,\
- extexecution.destroy,\
- glassfish.common,\
gototest,\
gsf,\
gsf.api,\
@@ -336,21 +314,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,\
@@ -359,28 +329,22 @@
lexer.nbbridge,\
lib.cvsclient,\
lib.terminalemulator,\
- 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,\
@@ -402,7 +366,6 @@
spellchecker.apimodule,\
spellchecker.bindings.htmlxml,\
spellchecker.bindings.properties,\
- spellchecker.dictionary_en,\
spellchecker.kit,\
spi.debugger.ui,\
spi.editor.hints,\
@@ -411,30 +374,25 @@
spi.tasklist,\
spi.viewmodel,\
subversion,\
- swing.validation,\
target.iterator,\
tasklist.kit,\
tasklist.projectint,\
tasklist.todo,\
tasklist.ui,\
- team.kit,\
terminal,\
usersguide,\
utilities,\
utilities.project,\
versioning,\
versioning.indexingbridge,\
- versioning.kenai,\
versioning.system.cvss,\
versioning.util,\
web.client.tools.api,\
web.common,\
- web.flyingsaucer,\
xml,\
xml.axi,\
xml.catalog,\
xml.core,\
- xml.jaxb.api,\
xml.lexer,\
xml.multiview,\
xml.retriever,\
@@ -445,8 +403,7 @@
xml.tools,\
xml.wsdl.model,\
xml.xam,\
- xml.xdm,\
- xsl
+ xml.xdm
validation.nb.cluster.ide=\
ide.kit
@@ -454,7 +411,6 @@
nb.cluster.java.depends=\
nb.cluster.ide,\
nb.cluster.platform,\
- nb.cluster.websvccommon,\
nb.cluster.harness
nb.cluster.java=\
ant.browsetask,\
@@ -466,30 +422,19 @@
api.java,\
beans,\
classfile,\
- dbschema,\
debugger.jpda,\
debugger.jpda.ant,\
debugger.jpda.projects,\
debugger.jpda.ui,\
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,\
@@ -516,37 +461,15 @@
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.osgi,\
- maven.persistence,\
- maven.repository,\
- maven.search,\
- maven.spring,\
o.apache.tools.ant.module,\
o.jdesktop.beansbinding,\
projectimport.eclipse.core,\
projectimport.eclipse.j2se,\
refactoring.java,\
spellchecker.bindings.java,\
- spring.beans,\
swingapp,\
- websvc.jaxws21,\
- websvc.jaxws21api,\
- websvc.saas.codegen.java,\
- xml.jaxb,\
xml.tools.java
validation.nb.cluster.java=\
java.kit
@@ -684,16 +607,11 @@
nb.cluster.harness
nb.cluster.apisupport=\
apisupport.ant,\
- apisupport.crudsample,\
- apisupport.feedreader,\
apisupport.installer,\
- apisupport.installer.maven,\
apisupport.kit,\
apisupport.osgidemo,\
- apisupport.paintapp,\
apisupport.project,\
- apisupport.refactoring,\
- maven.apisupport
+ apisupport.refactoring
nb.cluster.enterprise.dir=enterprise
nb.cluster.enterprise.depends=\
@@ -810,7 +728,6 @@
nb.cluster.nb.depends=nb.cluster.ide,nb.cluster.harness
nb.cluster.nb=\
autoupdate.pluginimporter,\
- bugzilla.exceptionreporter,\
ide.branding,\
ide.branding.kit,\
lib.uihandler,\
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 7 Feb 2010 01:30:14 -0000 1.5
+++ .cvsignore 27 Jul 2010 04:00:28 -0000 1.6
@@ -1 +1 @@
-netbeans-6.8-200912041610-src.zip
+netbeans-6.9-201006101454-src.zip
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log 7 Feb 2010 01:30:14 -0000 1.3
+++ import.log 27 Jul 2010 04:00:28 -0000 1.4
@@ -1,3 +1,4 @@
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
+netbeans-6_9-1_fc14:HEAD:netbeans-6.9-1.fc14.src.rpm:1280217574
Index: netbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/netbeans.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- netbeans.spec 16 Feb 2010 07:42:10 -0000 1.17
+++ netbeans.spec 27 Jul 2010 04:00:29 -0000 1.18
@@ -5,59 +5,61 @@
%define nb_ netbeans
%define nb_org %{nb_}.org
-%define nb_ver_major 6.8
+%define nb_ver_major 6.9
%define nb_ver %{nb_ver_major}
-%define nb_alt_priority 680
-%define nb_release_time 200907230233
+%define nb_alt_priority 690
+%define nb_release_time 201006101454
%define nb_home %{_datadir}/%{nb_}
%define nb_dir %{nb_home}/%{nb_ver}
+%define nb_legaldoc_dir ide.branding/release-toplevel
+%define nb_license %{nb_legaldoc_dir}/LICENSE.txt
-%define nb_platform_ver 11
-%define nb_platform platform%{nb_platform_ver}
-%define nb_platform_dir %{nb_home}/%{nb_platform}
+%define nb_platform_ver 12
+%define nb_platform platform
+%define nb_platform_dir %{nb_home}/%{nb_platform}%{nb_platform_ver}
%define nb_platform_pkg %{nb_}-platform
-%define nb_platform_vpkg %{nb_}-%{nb_platform}
+%define nb_platform_vpkg %{nb_}-%{nb_platform}%{nb_platform_ver}
-%define nb_harness harness
+%define nb_harness harness
%define nb_harness_dir %{nb_home}/%{nb_harness}
%define nb_harness_pkg %{nb_platform_pkg}-%{nb_harness}
-%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_vpkg %{nb_}-%{nb_ide}
-
-%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_vpkg %{nb_}-%{nb_java}
-
-%define nb_apisupport_ver 1
-%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_vpkg %{nb_}-%{nb_apisupport}
+%define nb_ide_ver 13
+%define nb_ide ide
+%define nb_ide_dir %{nb_home}/%{nb_ide}%{nb_ide_ver}
+%define nb_ide_pkg %{nb_}-%{nb_ide}
+%define nb_ide_vpkg %{nb_}-%{nb_ide}%{nb_ide_ver}
+
+%define nb_java_ver 4
+%define nb_java java
+%define nb_java_dir %{nb_home}/%{nb_java}%{nb_java_ver}
+%define nb_java_pkg %{nb_}-%{nb_java}
+%define nb_java_vpkg %{nb_}-%{nb_java}%{nb_java_ver}
+
+%define nb_apisupport_ver 2
+%define nb_apisupport apisupport
+%define nb_apisupport_dir %{nb_home}/%{nb_apisupport}%{nb_apisupport_ver}
+%define nb_apisupport_pkg %{nb_}-%{nb_apisupport}
+%define nb_apisupport_vpkg %{nb_}-%{nb_apisupport}%{nb_apisupport_ver}
-%define nb_nb nb%{nb_ver_major}
+%define nb_nb nb
%define nb_nb_dir %{nb_dir}/%{nb_nb}
%define nb_bin_dir %{nb_dir}/bin
%define nb_etc_dir %{nb_dir}/etc
%define nb_nb_config_dir %{nb_nb_dir}/config
+%define nb_cvsclient cvsclient
+%define nb_cvsclient_pkg %{nb_}-%{nb_cvsclient}
+%define nb_cvsclient_jar org-netbeans-lib-cvsclient.jar
+%define nb_cvsclient_dir %{nb_ide_dir}/modules
+%define nb_cvsclient_sysjar netbeans-cvsclient-%{nb_ver}.jar
+%define nb_cvsclient_sysln netbeans-cvsclient.jar
+
# See http://wiki.netbeans.org/NBDistroIDs
%define nb_distro_id NBFC
%define nb_javadoc_site http://bits.netbeans.org/%{nb_ver}/javadoc
-# Prevents use of autoupdate on the specified directory.
-# %1 the directory being prevented for autoupdate.
-%define noautoupdate() echo > %1/.noautoupdate
-
%define cluster base
%define nb_icon %{nb_nb_dir}/netbeans.png
@@ -67,10 +69,11 @@
%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} -v %{jdk_opt} %{compiler_opt} %{verify_opt}
+# Note: use the Ant option -v to get build log with details
+%define ant_nb_opt %{ant} %{jdk_opt} %{compiler_opt} %{verify_opt}
%define build_nb_dir nbbuild/netbeans
-# Layout defined by ant-1.7.0-1jpp.4.fc9.rpm
+# Layout defined by the ant package
%define ant_bin_dir /usr/bin
%define ant_etc_dir %{_datadir}/ant/etc
%define ant_lib_dir %{_datadir}/java
@@ -86,7 +89,7 @@
%define svnclientadapter_ver 6.7.1
%define svnclientadapter_jar %{svnclientadapter}.jar
-%define javaparser_ver %{nb_ver}
+%define javaparser_ver 6.9
# existing commons-logging-1.0.4.jar instead of required commons-logging-1.1.jar
%define commons_logging_ver 1.1
@@ -96,23 +99,51 @@
%define svnjavahl_ver 1.6.0
-# Links the system JAR
-# %1 - the sys jar name
-# %2 - the symlink
-%global lnSysJAR() if [ -f %{_javadir}/%{1} ] ; then %__ln_s -f %{_javadir}/%{*} ; else echo "%{1} doesn't exist." ; exit 1 ; fi ; \
+# Prevents use of autoupdate on the specified directory.
+# %%{1} the directory being prevented for autoupdate.
+%define noautoupdate() echo > %{1}/.noautoupdate
+# Creates the time stamp of the last modification for the NetBeans cluster.
+# See:
+# %%{nb_javadoc_site}/org-netbeans-bootstrap/overview-summary.html#java.io.File-.lastModified
+#
+# %%{1} the directory of the NetBeans cluster.
+%define lastModified() echo > %{1}/.lastModified
+
+# Creates artifacts of the NetBeans cluster.
+# %%{1} the directory of the NetBeans cluster.
+%define nbCluster() \
+ %{expand:%%noautoupdate %{1}} ; %{expand:%%lastModified %{1}} ;
+
+# Links the system JAR.
+# %%{1} - the sys jar
+# %%{2} - the symlink name/path (optional)
+%global lnSysJAR() \
+ if [ -f %{_javadir}/%{1} ] ; then \
+ %__ln_s -f %{_javadir}/%{*} ; \
+ else \
+ echo "%{1} doesn't exist." ; exit 1 ; \
+ fi ;
+
+%global rm_files_log ./rmFiles.lst
+
+# Removes all specified files, and creates the file rmFiles.lst.
+# %%{1} - the iname value, e.g. "*.zip"
+%global rmFiles() \
+ find . -type f \\( -iname %{1} \\) | \
+ tee -a %{rm_files_log} | xargs -t %__rm -f ;
Name: %{nb_}
Version: %{nb_ver}
-Release: 6%{?dist}
+Release: 1%{?dist}
Summary: Integrated Development Environment (IDE)
Group: Development/Tools
License: GPLv2 with exceptions or CDDL
Vendor: netbeans.org
URL: http://www.netbeans.org
-# The official zip is used: MD5: 1b085b82e04788beaf245859f818dcad
-Source0: http://download.netbeans.org/netbeans/6.8/final/zip/netbeans-6.8-200912041610-src.zip
+# Officially released zip is used:
+Source0: http://download.netbeans.org/netbeans/6.9/final/zip/netbeans-6.9-201006101454-src.zip
Source1: %{name}-ide.desktop-template
%define nb_desktop_template %{SOURCE1}
@@ -120,10 +151,10 @@ Source1: %{name}-ide.desktop-template
# Enables the Update Center (UC) for Fedora
Patch0: %{name}-%{version}~00-updatecenters.patch
# Removes actions against binary files
-Patch1: %{name}-%{version}~10-ant-patch.patch
-# Removes KenaiAction from the welcome page
-Patch2: %{name}-%{version}~20-welcome.patch
+Patch1: %{name}-%{version}~10-o.apache.tools.ant.module.patch
# Removes windows components
+# Avoids run of the task checkmoduleconfigs
+# Disables the checkmoduleconfigs task
Patch3: %{name}-%{version}~30-build-xml.patch
# Adapts IDE launcher for Fedora
# - unset DESKTOP_STARTUP_ID
@@ -141,11 +172,6 @@ Patch6: %{name}-%{version}~60-nosvnkit.p
# Sets up IDE configuration
Patch7: %{name}-%{version}~70-small-ide-cluster.patch
Patch8: %{name}-%{version}~71-cluster-properties.patch
-# Disables the checkmoduleconfigs task
-Patch9: %{name}-%{version}~80-check-modules.patch
-# Avoids failonerror during copying license file.
-# The file is moved to the top directory of the tarball.
-Patch10: %{name}-%{version}~90-copy_license.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -196,7 +222,7 @@ Requires: junit4 >= 4.5
%description
NetBeans IDE is an Integrated Development Environment (IDE) for Java/JavaFX,
-C/C++, Ruby, UML, etc. The NetBeans IDE is oriented on wide audience of
+C/C++, Ruby, PHP, etc. The NetBeans IDE is oriented on wide audience of
developers from beginners up to experts. A developer can find useful set of
the development tools that are embedded in the IDE or can be integrated with.
The NetBeans IDE is the modular system and it can be configured according to
@@ -204,7 +230,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
@@ -217,12 +243,12 @@ Requires: %{nb_harness_pkg} >= %{versi
Provides: %{nb_apisupport_vpkg} = %{version}-%{release}
-%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
@@ -234,6 +260,7 @@ Requires: ini4j
Requires: freemarker >= 2.3.8
Requires: xerces-j2 >= 2.7.1
Requires: netbeans-svnclientadapter >= %{svnclientadapter_ver}
+Requires: %{nb_cvsclient_pkg} >= %{version}
Requires: subversion-javahl
Requires: jakarta-commons-logging >= 1.0.4
Requires: jakarta-oro >= 2.0.8
@@ -242,23 +269,24 @@ Requires: bytelist
Requires: jvyamlb
Requires: jzlib
Requires: swingx
-# A requirement for the owner of the /usr/share/netbeans directory
+# A requirement for an owner of the /usr/share/netbeans directory
Requires: %{nb_platform_vpkg} >= %{version}
Provides: %{nb_ide_vpkg} = %{version}-%{release}
-%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: java-sdk >= 1:1.6.0
+Requires: java-javadoc >= 0:1.6.0
Requires: netbeans-javaparser >= %{javaparser_ver}
Requires: appframework >= 1.03
Requires: beansbinding >= 1.2.1
@@ -267,54 +295,44 @@ Requires: ant-junit >= 1.7.0
Requires: ant-nodeps >= 1.7.0
Requires: ant-trax >= 1.7.0
Requires: %{nb_ide_vpkg} >= %{version}
-# A requirement for the owner of the /usr/share/netbeans directory
+# A requirement for an owner of the /usr/share/netbeans directory
Requires: %{nb_platform_vpkg} >= %{version}
Provides: %{nb_java_vpkg} = %{version}-%{release}
-%description %{nb_java_}
+%description %{nb_java}
The NetBeans java cluster, version %{nb_java_ver}.
Common libraries for the NetBeans Java IDE.
+
+%package %{nb_cvsclient}
+
+Summary: NetBeans CVS Client Library
+Group: Development/Tools
+Requires: jpackage-utils
+Requires: java >= 1:1.6.0
+
+%description %{nb_cvsclient}
+Implementation of the client side of CVS server connection.
+Local connections are not supported.
+
%prep
%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
-
-# Generate stub jar file, so there is something in jsr223 module.
-%{__mkdir_p} libs.jsr223/src/javax/script
-echo "As of Java 6, JSR 223 is included in the JRE." > libs.jsr223/src/javax/script/readme.txt
-%{__mkdir_p} libs.jsr223/external
-jar cf libs.jsr223/external/jsr223-api.jar libs.jsr223/src/javax/script/readme.txt
-
-# Generate stub jar file, so there is something in swingapp module.
-%{__mkdir_p} swingapp/src/javax/swing
-echo "As of Java 6, SwingWorker is included in the JRE." > swingapp/src/javax/swing/SwingWorker-readme.txt
-%{__mkdir_p} swingapp/external
-jar cf swingapp/external/swing-worker-1.1.jar swingapp/src/javax/swing/SwingWorker-readme.txt
+%rmFiles "*.jar"
+%rmFiles "*.zip"
+%rmFiles "binaries-list"
+%rmFiles "*.ser"
-# 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".
-# see also classpath in the jhindexer task in nbbuild/templates/projectized.xml (334)
-%{__mkdir_p} apisupport.harness/external
-%lnSysJAR javahelp2.jar apisupport.harness/external/jsearch-2.0_05.jar
-%lnSysJAR javahelp2.jar javahelp/external/jh-2.0_05.jar
-# - links ant libs
-%{__ln_s} -f %{_javadir} o.apache.tools.ant.module/external/lib
%patch0 -p1 -b .sav
%patch1 -p1 -b .sav
-%patch2 -p1 -b .sav
%patch3 -p1 -b .sav
%patch4 -p1 -b .sav
%patch5 -p1 -b .sav
%patch6 -p1 -b .sav
%patch7 -p1 -b .sav
%patch8 -p1 -b .sav
-%patch9 -p1 -b .sav
-%patch10 -p1 -b .sav
%build
@@ -351,18 +369,32 @@ JAVA_EXT_DIR=%{build_nb_dir}/%{nb_java}/
%lnSysJAR beansbinding.jar ${JAVA_EXT_DIR}/beansbinding-1.2.1.jar
%lnSysJAR junit.jar ${JAVA_EXT_DIR}/junit-3.8.2.jar
+# To build the netbeans modules the installed jars will be used instead of pre-packaged ones
+# - at least java.editor requires:
+%lnSysJAR netbeans-javaparser-api.jar libs.javacapi/external/javac-api-nb-7.0-b07.jar
+%lnSysJAR netbeans-javaparser-impl.jar libs.javacimpl/external/javac-impl-nb-7.0-b07.jar
+# - at least java.examples/ClientEditor requires:
+%lnSysJAR swing-layout.jar o.jdesktop.layout/external/swing-layout-1.0.4.jar
+# - javahelp2.jar is required in the build target "bootstrap" for "JavaHelp indexing".
+# see also classpath in the jhindexer task in nbbuild/templates/projectized.xml (334)
+%{__mkdir_p} apisupport.harness/external
+%lnSysJAR javahelp2.jar apisupport.harness/external/jsearch-2.0_05.jar
+%lnSysJAR javahelp2.jar javahelp/external/jh-2.0_05.jar
+
+%define build_nb_platform_dir $(pwd)/%{build_nb_dir}/%{nb_platform}
+
%{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} \
- -Do.n.bootstrap.dir=%{nb_platform_dir} \
- -Dopenide.awt.dir=%{nb_platform_dir} \
- -Dlibs.beans-binding.classpath=%{_javadir}/beansbinding.jar \
- -Dlibs.swing-layout.classpath=%{_javadir}/swing-layout.jar \
- -Dcluster.config=basic \
- -f nbbuild/build.xml build-nozip
+-Do.n.core.dir=%{build_nb_platform_dir} \
+-Dcore.dir=%{build_nb_platform_dir} \
+-Dcore.startup.dir=%{build_nb_platform_dir} \
+-Dopenide.awt.dir=%{build_nb_platform_dir} \
+-Dlibs.beans-binding.classpath=%{_javadir}/beansbinding.jar \
+-Dext.binaries.downloaded=true \
+-Dnb.cluster.platform-is-built=true \
+-Dnb.cluster.harness-is-built=true \
+-Ddo-not-rebuild-clusters=true \
+-Dcluster.config=basic \
+-f nbbuild/build.xml build-nozip
# Build desktop file
%{__cp} -p %{nb_desktop_template} %{nb_desktop}
@@ -411,11 +443,11 @@ install_package() {
# Install apisupport
install_package %{buildroot}%{nb_apisupport_dir} %{build_nb_dir}/%{nb_apisupport}/*
-%noautoupdate %{buildroot}%{nb_apisupport_dir}
+%nbCluster %{buildroot}%{nb_apisupport_dir}
# Install ide
install_package %{buildroot}%{nb_ide_dir} %{build_nb_dir}/%{nb_ide}/*
-%noautoupdate %{buildroot}%{nb_ide_dir}
+%nbCluster %{buildroot}%{nb_ide_dir}
# linking the ide to the external JARs
pushd %{buildroot}%{nb_ide_dir}/modules/ext
@@ -437,12 +469,44 @@ pushd %{buildroot}%{nb_ide_dir}/modules/
%lnSysJAR swingx.jar swingx-0.2.3.jar
popd
+# Install cvsclient (extract from ide)
+
+install -d -m 0755 %{buildroot}%{_javadir}
+# jar
+install -m 644 %{buildroot}%{nb_cvsclient_dir}/%{nb_cvsclient_jar} \
+ %{buildroot}%{_javadir}/%{nb_cvsclient_sysjar}
+# versionless link to the system jar
+(cd %{buildroot}%{_javadir} && \
+ %__ln_s %{nb_cvsclient_sysjar} %{nb_cvsclient_sysln})
+# linking the ide to the system jar
+(cd %{buildroot}%{nb_cvsclient_dir} && \
+ %__ln_s -f %{_javadir}/%{nb_cvsclient_sysjar} %{nb_cvsclient_jar})
+
# Install java
install_package %{buildroot}%{nb_java_dir} %{build_nb_dir}/%{nb_java}/*
# install java ant
install -d -m 755 %{buildroot}%{nb_java_dir}/ant/bin
install -d -m 755 %{buildroot}%{nb_java_dir}/ant/lib
-%noautoupdate %{buildroot}%{nb_java_dir}
+%nbCluster %{buildroot}%{nb_java_dir}
+
+# "linking" Java API javadoc
+%define nb_java_cSP_dir %{nb_java_dir}/config/Services/Platforms
+%define JDK_ver 1.6
+%{__mkdir_p} %{buildroot}%{nb_java_cSP_dir}/org-netbeans-api-java-Platform/
+cat <<KONEC >%{buildroot}%{nb_java_cSP_dir}/org-netbeans-api-java-Platform/default_platform.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE platform PUBLIC "-//NetBeans//DTD Java PlatformDefinition 1.0//EN"
+ "http://www.netbeans.org/dtds/java-platformdefinition-1_0.dtd">
+<platform default="yes" name="JDK %{JDK_ver} (Default)">
+ <properties>
+ <property name="platform.ant.name" value="default_platform"/>
+ </properties>
+ <javadoc>
+ <resource>file:/usr/share/javadoc/java/</resource>
+ </javadoc>
+</platform>
+KONEC
+
# linking the java to the external JARs
pushd %{buildroot}%{nb_java_dir}/modules/ext
@@ -475,21 +539,17 @@ install_package %{buildroot}%{nb_nb_dir}
install_package %{buildroot}%{nb_bin_dir} %{build_nb_dir}/bin/*
# install nb etc (netbeans.conf, netbeans.clusters)
install_package %{buildroot}%{nb_etc_dir} %{build_nb_dir}/etc/*
-# install nb htmls
-%{__cp} -p %{build_nb_dir}/CREDITS.html %{buildroot}%{nb_dir}/
-%{__cp} -p %{build_nb_dir}/README.html %{buildroot}%{nb_dir}/
-%{__cp} -p %{build_nb_dir}/netbeans.css %{buildroot}%{nb_dir}/
# inistall nb/nbX.X config
echo -n "%{nb_distro_id}" > %{buildroot}%{nb_nb_config_dir}/productid
-%noautoupdate %{buildroot}%{nb_nb_dir}
+%nbCluster %{buildroot}%{nb_nb_dir}
# Links to nbX.X components
pushd %{buildroot}%{nb_dir}
- %{__ln_s} ../%{nb_harness} %{nb_harness}
- %{__ln_s} ../%{nb_apisupport} %{nb_apisupport}
- %{__ln_s} ../%{nb_ide} %{nb_ide}
- %{__ln_s} ../%{nb_java} %{nb_java}
- %{__ln_s} ../%{nb_platform} %{nb_platform}
+ %{__ln_s} ../%{nb_harness} %{nb_harness}
+ %{__ln_s} ../%{nb_apisupport}%{nb_apisupport_ver} %{nb_apisupport}
+ %{__ln_s} ../%{nb_ide}%{nb_ide_ver} %{nb_ide}
+ %{__ln_s} ../%{nb_java}%{nb_java_ver} %{nb_java}
+ %{__ln_s} ../%{nb_platform}%{nb_platform_ver} %{nb_platform}
popd
# Install desktop file
@@ -518,48 +578,57 @@ fi
%dir %{nb_bin_dir}/
%attr(755,root,root) %{nb_launcher}
%{nb_etc_dir}/
-%doc %{nb_dir}/CREDITS.html
-%doc %{nb_dir}/README.html
-%doc %{nb_dir}/netbeans.css
%dir %{_datadir}/applications/%{nb_org}/
-%{nb_nb_dir}/.noautoupdate
%{_datadir}/applications/%{nb_org}/%{nb_desktop}
-%doc ide.branding/release-toplevel/LICENSE.txt
+%doc %{nb_legaldoc_dir}/*
-%files %{nb_apisupport_}
+%files %{nb_apisupport}
%defattr(-,root,root,-)
%{nb_apisupport_dir}/
-%{nb_apisupport_dir}/.noautoupdate
-%doc ide.branding/release-toplevel/LICENSE.txt
+%doc %{nb_license}
-%files %{nb_ide_}
+%files %{nb_ide}
%defattr(-,root,root,-)
%{nb_ide_dir}/
-%{nb_ide_dir}/.noautoupdate
-%doc ide.branding/release-toplevel/LICENSE.txt
+%doc %{nb_license}
-%files %{nb_java_}
+%files %{nb_java}
%defattr(-,root,root,-)
%{nb_java_dir}/
-%{nb_java_dir}/.noautoupdate
-%doc ide.branding/release-toplevel/LICENSE.txt
+%doc %{nb_license}
+
+%files %{nb_cvsclient}
+%defattr(-,root,root,-)
+%{_javadir}/*
+%doc %{nb_license}
%changelog
-* Mon Feb 15 2010 Victor Vasilyev <victor.vasilyev at sun.com> 6.8-6
+* 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
+- re-base for the NetBeans 6.9
+
+* Mon Feb 15 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.8-6
- Provide vpkg for all cluster packages, but not harness
- stub jar files: jsr223, swing-worker
- swingx
-* Thu Feb 11 2010 Victor Vasilyev <victor.vasilyev at sun.com> 6.8-5
+
+* Thu Feb 11 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.8-5
- add dependencies on Jruby's pkgs: bytelist, jvyamlb
- clean up comments
-* Wed Feb 10 2010 Victor Vasilyev <victor.vasilyev at sun.com> 6.8-4
+
+* Wed Feb 10 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.8-4
- set priority of alternatives to 680
- remove the fake tag 'provides' needed only for rebuilding maven-scm
-* Mon Feb 08 2010 Victor Vasilyev <victor.vasilyev at sun.com> 6.8-3
+
+* Mon Feb 08 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.8-3
- a fake tag 'provides' needed only for rebuilding maven-scm
-* Sat Feb 06 2010 Victor Vasilyev <victor.vasilyev at sun.com> 6.8-2
+
+* Sat Feb 06 2010 Victor G. 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
+
+* Thu Nov 26 2009 Victor G. 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
+
+* Sat May 23 2009 Victor G. 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.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 7 Feb 2010 01:30:16 -0000 1.5
+++ sources 27 Jul 2010 04:00:29 -0000 1.6
@@ -1 +1 @@
-1b085b82e04788beaf245859f818dcad netbeans-6.8-200912041610-src.zip
+6bf29512bec0aa49f1ea3670742cd5e8 netbeans-6.9-201006101454-src.zip
--- netbeans-6.8~00-updatecenters.patch DELETED ---
--- netbeans-6.8~10-ant-patch.patch DELETED ---
--- netbeans-6.8~20-welcome.patch DELETED ---
--- netbeans-6.8~30-build-xml.patch DELETED ---
--- netbeans-6.8~40-ide-launcher.patch DELETED ---
--- netbeans-6.8~50-build-copy.patch DELETED ---
--- netbeans-6.8~60-nosvnkit.patch DELETED ---
--- netbeans-6.8~70-small-ide-cluster.patch DELETED ---
--- netbeans-6.8~71-cluster-properties.patch DELETED ---
--- netbeans-6.8~80-check-modules.patch DELETED ---
--- netbeans-6.8~90-copy_license.patch DELETED ---
More information about the scm-commits
mailing list