Fri Aug 14 08:48:53 UTC 2009

Author: victorv

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

Modified Files:
	.cvsignore import.log netbeans.spec sources 
Added 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 
Removed Files:
	netbeans-6.5-00-copy-build.patch 
	netbeans-6.5-10-ant-external-build.patch 
	netbeans-6.5-20-ant-build.patch 
	netbeans-6.5-30-parse-project-xml.patch 
	netbeans-6.5-40-build-xml.patch 
	netbeans-6.5-50-ide-launcher.patch 
	netbeans-6.5-60-small-ide-config.patch 
	netbeans-6.5-70-updatecenters.patch 
	netbeans-6.5-80-nosvnkit.patch 
Log Message:
Re-base for the NetBeans 6.7.1


netbeans-6.7.1 at 00-updatecenters.patch:
 Bundle.properties |    3 +++
 mf-layer.xml      |   13 ++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE netbeans-6.7.1 at 00-updatecenters.patch ---
diff -Nur netbeans-6.7.1/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties netbeans-6.7.1.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
--- netbeans-6.7.1/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties	2009-08-05 00:31:46.000000000 +0400
+++ netbeans-6.7.1.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties	2009-08-05 21:41:02.000000000 +0400
@@ -51,9 +51,12 @@
 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.7.1/uc/final/stable/catalog.xml.gz?{$netbeans.hash.code}
 URL_Beta=http://updates.netbeans.org/netbeans/updates/6.7.1/uc/final/beta/catalog.xml.gz?{$netbeans.hash.code}
 URL_ThirdParty=http://updates.netbeans.org/netbeans/updates/6.7.1/uc/final/thirdparty/catalog.xml.gz?{$netbeans.hash.code}
 URL_PluginPortal=http://plugins.netbeans.org/nbpluginportal/updates/6.7/catalog.xml.gz
+URL_Standard_Fedora=http://updates.netbeans.org/netbeans/updates/6.7.1/uc/final/fedora/catalog.xml.gz?{$netbeans.hash.code}
+
 
diff -Nur netbeans-6.7.1/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml netbeans-6.7.1.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
--- netbeans-6.7.1/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml	2009-08-05 00:31:46.000000000 +0400
+++ netbeans-6.7.1.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml	2009-08-05 21:46:02.000000000 +0400
@@ -54,7 +54,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>
@@ -92,6 +92,17 @@
         <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.7.1 at 10-ant-patch.patch:
 build.xml          |   15 ---------------
 external/build.xml |    1 -
 2 files changed, 16 deletions(-)

--- NEW FILE netbeans-6.7.1 at 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.7.1 at 20-parse-project-xml.patch:
 ParseProjectXml.java |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE netbeans-6.7.1 at 20-parse-project-xml.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.5/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java netbeans-6.5.new/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java
--- netbeans-6.5/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java	2008-11-10 00:13:54.000000000 +0300
+++ netbeans-6.5.new/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java	2009-01-10 19:02:41.000000000 +0300
@@ -1247,6 +1247,7 @@
             for (File jar : jars) {
                 if (!jar.isFile()) {
                     log("Classpath entry " + jar + " does not exist; skipping", Project.MSG_WARN);
+                    continue;
                 }
                 InputStream is = new FileInputStream(jar);
                 try {

netbeans-6.7.1 at 30-build-xml.patch:
 nbbuild/build.xml       |    1 -
 o.n.bootstrap/build.xml |    2 --
 2 files changed, 3 deletions(-)

--- NEW FILE netbeans-6.7.1 at 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.7.1 at 40-ide-launcher.patch:
 netbeans |   22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

--- NEW FILE netbeans-6.7.1 at 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.7.1/ide/launcher/unix/netbeans	2009-07-27 15:43:48.000000000 +0400
+++ netbeans-6.7.1.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.7.1/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.7.1 at 50-build-copy.patch:
 css.editor/nbproject/project.properties              |    1 -
 html.editor/nbproject/project.properties             |    1 -
 junit/nbproject/project.properties                   |    5 -----
 libs.commons_logging/nbproject/project.properties    |    1 -
 libs.commons_net/nbproject/project.properties        |    1 -
 libs.freemarker/nbproject/project.properties         |    1 -
 libs.ini4j/nbproject/project.properties              |    1 -
 libs.jakarta_oro/nbproject/project.properties        |    1 -
 libs.javacapi/nbproject/project.properties           |    1 -
 libs.javacimpl/nbproject/project.properties          |    1 -
 libs.jna/nbproject/project.properties                |    1 -
 libs.jsch/nbproject/project.properties               |    1 -
 libs.junit4/nbproject/project.properties             |    1 -
 libs.lucene/nbproject/project.properties             |    1 -
 libs.svnClientAdapter/nbproject/project.properties   |    2 --
 libs.xerces/nbproject/project.properties             |    1 -
 o.apache.xml.resolver/nbproject/project.properties   |    1 -
 o.jdesktop.beansbinding/nbproject/project.properties |    2 --
 o.jdesktop.layout/nbproject/project.properties       |    3 ---
 swingapp/nbproject/project.properties                |    3 ---
 20 files changed, 30 deletions(-)

--- NEW FILE netbeans-6.7.1 at 50-build-copy.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/css.editor/nbproject/project.properties netbeans-6.7.1.new/css.editor/nbproject/project.properties
--- netbeans-6.7.1/css.editor/nbproject/project.properties	2009-08-12 19:59:07.000000000 +0400
+++ netbeans-6.7.1.new/css.editor/nbproject/project.properties	2009-08-12 20:06:31.000000000 +0400
@@ -37,7 +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/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.7.1/html.editor/nbproject/project.properties netbeans-6.7.1.new/html.editor/nbproject/project.properties
--- netbeans-6.7.1/html.editor/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/html.editor/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -37,7 +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/html-4.01.zip=docs/html-4.01.zip
 
 javac.compilerargs=-Xlint:unchecked
 javac.source=1.5
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/junit/nbproject/project.properties netbeans-6.7.1.new/junit/nbproject/project.properties
--- netbeans-6.7.1/junit/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/junit/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -42,11 +42,6 @@
 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
 
 # XXX AntBridge.createMainClassPath probably would not find this anyway:
 jnlp.verify.excludes=ant/patches/72080.jar
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.commons_logging/nbproject/project.properties netbeans-6.7.1.new/libs.commons_logging/nbproject/project.properties
--- netbeans-6.7.1/libs.commons_logging/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.commons_logging/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,5 +38,4 @@
 # 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
 spec.version.base=1.8.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.commons_net/nbproject/project.properties netbeans-6.7.1.new/libs.commons_net/nbproject/project.properties
--- netbeans-6.7.1/libs.commons_net/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.commons_net/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,5 +38,4 @@
 # 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
 spec.version.base=1.3.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.freemarker/nbproject/project.properties netbeans-6.7.1.new/libs.freemarker/nbproject/project.properties
--- netbeans-6.7.1/libs.freemarker/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.freemarker/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -41,6 +41,5 @@
 
 javac.compilerargs=-Xlint:unchecked
 javac.source=1.5
-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.6.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.ini4j/nbproject/project.properties netbeans-6.7.1.new/libs.ini4j/nbproject/project.properties
--- netbeans-6.7.1/libs.ini4j/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.ini4j/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,7 +38,6 @@
 # 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
 module.jar.verifylinkageignores=org.ini4j.IniPreferencesFactoryListener
 
 # Fatal error: class javax.servlet.ServletContextListener not found
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.jakarta_oro/nbproject/project.properties netbeans-6.7.1.new/libs.jakarta_oro/nbproject/project.properties
--- netbeans-6.7.1/libs.jakarta_oro/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.jakarta_oro/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,5 +38,4 @@
 # 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
 spec.version.base=1.2.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.javacapi/nbproject/project.properties netbeans-6.7.1.new/libs.javacapi/nbproject/project.properties
--- netbeans-6.7.1/libs.javacapi/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.javacapi/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -44,6 +44,5 @@
 nbm.homepage=http://jackpot.netbeans.org/
 nbm.module.author=Petr Hrebejk, Sun Microsystems, Inc.
 spec.version.base=0.8.1
-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.7.1/libs.javacimpl/nbproject/project.properties netbeans-6.7.1.new/libs.javacimpl/nbproject/project.properties
--- netbeans-6.7.1/libs.javacimpl/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.javacimpl/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -41,7 +41,6 @@
 nbm.homepage=http://jackpot.netbeans.org/
 nbm.module.author=Petr Hrebejk, Sun Microsystems, Inc.
 spec.version.base=0.10.2
-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.7.1/libs.jna/nbproject/project.properties netbeans-6.7.1.new/libs.jna/nbproject/project.properties
--- netbeans-6.7.1/libs.jna/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.jna/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -37,4 +37,3 @@
 # 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
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.jsch/nbproject/project.properties netbeans-6.7.1.new/libs.jsch/nbproject/project.properties
--- netbeans-6.7.1/libs.jsch/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.jsch/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,7 +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
 spec.version.base=1.8.1
 sigtest.gen.fail.on.error=false
 
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.junit4/nbproject/project.properties netbeans-6.7.1.new/libs.junit4/nbproject/project.properties
--- netbeans-6.7.1/libs.junit4/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.junit4/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,7 +38,6 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/junit-4.5.jar=modules/ext/junit-4.5.jar
 
 
 sigtest.skip.check=true
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.lucene/nbproject/project.properties netbeans-6.7.1.new/libs.lucene/nbproject/project.properties
--- netbeans-6.7.1/libs.lucene/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.lucene/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,5 +38,4 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/lucene-core-2.3.2.jar=modules/ext/lucene-core-2.3.2.jar
 spec.version.base=2.5.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/libs.svnClientAdapter/nbproject/project.properties netbeans-6.7.1.new/libs.svnClientAdapter/nbproject/project.properties
--- netbeans-6.7.1/libs.svnClientAdapter/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.svnClientAdapter/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -40,8 +40,6 @@
 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
 
 # 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.7.1/libs.xerces/nbproject/project.properties netbeans-6.7.1.new/libs.xerces/nbproject/project.properties
--- netbeans-6.7.1/libs.xerces/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/libs.xerces/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,6 +38,5 @@
 # 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
 module.jar.verifylinkageignores=org.apache.xerces.util.XMLCatalogResolver
 spec.version.base=1.13.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/o.apache.xml.resolver/nbproject/project.properties netbeans-6.7.1.new/o.apache.xml.resolver/nbproject/project.properties
--- netbeans-6.7.1/o.apache.xml.resolver/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/o.apache.xml.resolver/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,5 +38,4 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/resolver-1.2.jar=modules/ext/resolver-1.2.jar
 spec.version.base=1.6.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/o.jdesktop.beansbinding/nbproject/project.properties netbeans-6.7.1.new/o.jdesktop.beansbinding/nbproject/project.properties
--- netbeans-6.7.1/o.jdesktop.beansbinding/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/o.jdesktop.beansbinding/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,7 +38,5 @@
 # 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
 jnlp.indirect.jars=docs/beansbinding-1.2.1-doc.zip
 spec.version.base=1.2.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/o.jdesktop.layout/nbproject/project.properties netbeans-6.7.1.new/o.jdesktop.layout/nbproject/project.properties
--- netbeans-6.7.1/o.jdesktop.layout/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/o.jdesktop.layout/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -38,8 +38,5 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/swing-layout-1.0.3.jar=modules/ext/swing-layout-1.0.3.jar
-release.external/swing-layout-1.0.3-doc.zip=docs/swing-layout-1.0.3-doc.zip
-release.external/swing-layout-1.0.3-src.zip=docs/swing-layout-1.0.3-src.zip
 jnlp.indirect.jars=docs/swing-layout-1.0.3-doc.zip, docs/swing-layout-1.0.3-src.zip
 spec.version.base=1.7.1
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/swingapp/nbproject/project.properties netbeans-6.7.1.new/swingapp/nbproject/project.properties
--- netbeans-6.7.1/swingapp/nbproject/project.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/swingapp/nbproject/project.properties	2009-08-12 20:01:06.000000000 +0400
@@ -1,6 +1,3 @@
-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.4.1

netbeans-6.7.1 at 60-nosvnkit.patch:
 SvnClientAdapterFactory.java |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE netbeans-6.7.1 at 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.7.1 at 70-small-ide-cluster.patch:
 apisupport.kit/nbproject/project.xml |   13 -----
 editor.kit/nbproject/project.xml     |   48 ++------------------
 form.kit/nbproject/project.xml       |   13 -----
 ide.kit/nbproject/project.xml        |    4 -
 java.kit/nbproject/project.xml       |   20 --------
 nbbuild/cluster.properties           |   82 +----------------------------------
 6 files changed, 13 insertions(+), 167 deletions(-)

--- NEW FILE netbeans-6.7.1 at 70-small-ide-cluster.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/apisupport.kit/nbproject/project.xml netbeans-6.7.1.new/apisupport.kit/nbproject/project.xml
--- netbeans-6.7.1/apisupport.kit/nbproject/project.xml	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/apisupport.kit/nbproject/project.xml	2009-08-12 19:38:36.000000000 +0400
@@ -12,25 +12,12 @@
                     </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.14.2</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>
                         <specification-version>1.28.2</specification-version>
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/editor.kit/nbproject/project.xml netbeans-6.7.1.new/editor.kit/nbproject/project.xml
--- netbeans-6.7.1/editor.kit/nbproject/project.xml	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/editor.kit/nbproject/project.xml	2009-08-12 19:42:05.000000000 +0400
@@ -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.bracesmatching</code-name-base>
                     <run-dependency>
                         <release-version>0-1</release-version>
@@ -20,13 +13,13 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.html</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.23</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
+                     <code-name-base>org.netbeans.modules.html</code-name-base>
+                     <run-dependency>
+                         <release-version>1</release-version>
+                         <specification-version>1.23</specification-version>
+                     </run-dependency>
+                 </dependency>
+                 <dependency>
                     <code-name-base>org.netbeans.modules.image</code-name-base>
                     <run-dependency>
                         <release-version>1</release-version>
@@ -34,13 +27,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.105.2</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>
@@ -53,12 +39,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>
                         <specification-version>1.0</specification-version>
@@ -78,13 +58,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>
@@ -117,13 +90,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.7.1/form.kit/nbproject/project.xml netbeans-6.7.1.new/form.kit/nbproject/project.xml
--- netbeans-6.7.1/form.kit/nbproject/project.xml	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/form.kit/nbproject/project.xml	2009-08-12 19:38:36.000000000 +0400
@@ -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.7.1/ide.kit/nbproject/project.xml netbeans-6.7.1.new/ide.kit/nbproject/project.xml
--- netbeans-6.7.1/ide.kit/nbproject/project.xml	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/ide.kit/nbproject/project.xml	2009-08-12 19:38:36.000000000 +0400
@@ -144,13 +144,13 @@
                         <specification-version>1.11</specification-version>
                     </run-dependency>
                 </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-->
                 <dependency>
                     <code-name-base>org.netbeans.modules.jumpto</code-name-base>
                     <run-dependency>
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/java.kit/nbproject/project.xml netbeans-6.7.1.new/java.kit/nbproject/project.xml
--- netbeans-6.7.1/java.kit/nbproject/project.xml	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/java.kit/nbproject/project.xml	2009-08-12 19:38:36.000000000 +0400
@@ -198,31 +198,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>
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/nbbuild/cluster.properties netbeans-6.7.1.new/nbbuild/cluster.properties
--- netbeans-6.7.1/nbbuild/cluster.properties	2009-08-12 19:34:55.000000000 +0400
+++ netbeans-6.7.1.new/nbbuild/cluster.properties	2009-08-12 19:40:56.000000000 +0400
@@ -110,9 +110,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=\
@@ -257,24 +255,10 @@
         api.debugger,\
         api.java.classpath,\
         api.xml,\
-        bugtracking,\
-        bugtracking.bridge,\
-        bugzilla,\
         classfile,\
         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,\
@@ -312,50 +296,31 @@
         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,\
         jumpto,\
-        kenai,\
-        kenai.collab,\
-        kenai.ui,\
         languages,\
         languages.diff,\
         languages.manifest,\
-        languages.yaml,\
         lexer,\
         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.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,\
@@ -372,7 +337,6 @@
         refactoring.api,\
         schema2beans,\
         server,\
-        servletapi,\
         spi.debugger.ui,\
         spi.editor.hints,\
         spi.navigator,\
@@ -384,7 +348,6 @@
         tasklist.projectint,\
         tasklist.todo,\
         tasklist.ui,\
-        team.kit,\
         usersguide,\
         utilities,\
         utilities.project,\
@@ -392,7 +355,6 @@
         versioning.system.cvss,\
         versioning.util,\
         web.client.tools.api,\
-        web.flyingsaucer,\
         xml,\
         xml.axi,\
         xml.catalog,\
@@ -407,14 +369,12 @@
         xml.tools,\
         xml.wsdl.model,\
         xml.xam,\
-        xml.xdm,\
-        xsl
+        xml.xdm
 
 nb.cluster.java.dir=java2
 nb.cluster.java.depends=\
         nb.cluster.ide,\
-        nb.cluster.platform,\
-        nb.cluster.websvccommon
+        nb.cluster.platform
 nb.cluster.java=\
         ant.browsetask,\
         ant.debugger,\
@@ -424,30 +384,18 @@
         api.debugger.jpda,\
         api.java,\
         beans,\
-        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.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,\
@@ -472,34 +420,14 @@
         javadoc,\
         javawebstart,\
         junit,\
-        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
@@ -543,12 +471,10 @@
         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=enterprise5
 nb.cluster.enterprise.depends=\

netbeans-6.7.1 at 80-check-modules.patch:
 build.xml |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE netbeans-6.7.1 at 80-check-modules.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.7.1/nbbuild/build.xml netbeans-6.7.1.new/nbbuild/build.xml
--- netbeans-6.7.1/nbbuild/build.xml	2009-08-06 18:13:50.000000000 +0400
+++ netbeans-6.7.1.new/nbbuild/build.xml	2009-08-06 18:14:49.000000000 +0400
@@ -162,7 +162,6 @@
     <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=".."/>
   </target>
 
   <target name="set-buildnumber" unless="buildnumber">

netbeans-6.7.1 at 90-copy_license.patch:
 build.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netbeans-6.7.1 at 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"/>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Jan 2009 16:53:05 -0000	1.3
+++ .cvsignore	14 Aug 2009 08:48:51 -0000	1.4
@@ -1 +1 @@
-netbeans-6.5-200811100001-base-src-linux.tar.gz
+netbeans-6.7.1-200907230233-base-src-linux.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Sep 2008 00:38:06 -0000	1.1
+++ import.log	14 Aug 2009 08:48:51 -0000	1.2
@@ -1 +1,2 @@
 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


Index: netbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/netbeans.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- netbeans.spec	25 Jul 2009 18:01:28 -0000	1.11
+++ netbeans.spec	14 Aug 2009 08:48:53 -0000	1.12
@@ -5,13 +5,14 @@
 
 %define nb_              netbeans
 %define nb_org           %{nb_}.org
-%define nb_ver           6.5
-%define nb_alt_priority  650
-%define nb_release_time  200811100001
+%define nb_ver_major     6.7
+%define nb_ver           %{nb_ver_major}.1
+%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  9
+%define nb_platform_ver  10
 %define nb_platform      platform%{nb_platform_ver}
 %define nb_platform_dir  %{nb_home}/%{nb_platform}
 %define nb_platform_pkg  %{nb_}-platform
@@ -20,7 +21,7 @@
 %define nb_harness_dir   %{nb_home}/%{nb_harness}
 %define nb_harness_pkg   %{nb_platform_pkg}-%{nb_harness}
 
-%define nb_ide_ver       10
+%define nb_ide_ver       11
 %define nb_ide           ide%{nb_ide_ver}
 %define nb_ide_dir       %{nb_home}/%{nb_ide}
 %define nb_ide_pkg       %{nb_}-%{nb_ide}
@@ -35,7 +36,7 @@
 %define nb_apisupport_dir  %{nb_home}/%{nb_apisupport}
 %define nb_apisupport_pkg  %{nb_}-%{nb_apisupport}
 
-%define nb_nb         nb%{nb_ver}
+%define nb_nb         nb%{nb_ver_major}
 %define nb_nb_dir     %{nb_dir}/%{nb_nb}
 %define nb_bin_dir    %{nb_dir}/bin
 %define nb_etc_dir    %{nb_dir}/etc
@@ -69,42 +70,76 @@
 
 # Used xml resolver
 %define xml_resolver netbeans-resolver
-# %define xml_resolver_ver %{nb_ver}
-%define xml_resolver_ver 6.1
-%define xml_resolver_jar %{_javadir}/%{xml_resolver}-%{xml_resolver_ver}.jar
+%define xml_resolver_ver %{nb_ver}
+%define xml_resolver_jar %{xml_resolver}-%{xml_resolver_ver}.jar
 
 # Used svn client adapter
 %define svnclientadapter     netbeans-svnclientadapter
 %define svnclientadapter_ver %{nb_ver}
-%define svnclientadapter_jar %{_javadir}/%{svnclientadapter}-%{svnclientadapter_ver}.jar
+%define svnclientadapter_jar %{svnclientadapter}.jar
+
+%define javaparser_ver %{nb_ver}
+
+# existing commons-logging-1.0.4.jar instead of required commons-logging-1.1.jar
+%define commons_logging_ver 1.1
+
+# existing ini4j-0.3.2.jar instead of required ini4j-0.4.1.jar
+%define ini4j_ver 0.4.1
+
+%define svnjavahl_ver 1.6.0
+
+# Links the system JAR
+# %1 - the sys jar name
+# %2 - the symlink
+%define lnSysJAR() %{__ln_s} -f %{_javadir}/%{1} %{2} ;
 
 Name:           %{nb_}
 Version:        %{nb_ver}
-Release:        4%{?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
 
-Source0: http://nbi.netbeans.org/files/documents/210/2387/%{nb_}-%{nb_ver}-%{nb_release_time}-%{cluster}-src-linux.tar.gz
+# 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
+
 Source1: %{name}-ide.desktop-template
 %define nb_desktop_template %{SOURCE1}
 
-Patch0: %{name}-%{version}-00-copy-build.patch
-Patch1: %{name}-%{version}-10-ant-external-build.patch
-Patch2: %{name}-%{version}-20-ant-build.patch
-Patch3: %{name}-%{version}-30-parse-project-xml.patch
-Patch4: %{name}-%{version}-40-build-xml.patch
+# 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 
+# Makes org/netbeans/nbbuild/ParseProjectXml.java happy
+# even if  a classpath entry (jar) does not exist
+Patch2: %{name}-%{version}@20-parse-project-xml.patch 
+# Removes windows components
+Patch3: %{name}-%{version}@30-build-xml.patch
+# Adapts IDE launcher for Fedora
+# - unset DESKTOP_STARTUP_ID
+# - set progdir
+# - exec /etc/netbeans.conf
+# - avoid interactive accepting license
 # http://wiki.netbeans.org/Fedora10PackagingNBIDELauncher
 # https://bugzilla.redhat.com/show_bug.cgi?id=464820
 # https://bugzilla.redhat.com/show_bug.cgi?id=467546
-Patch5: %{name}-%{version}-50-ide-launcher.patch
-Patch6: %{name}-%{version}-60-small-ide-config.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=466179
-Patch7: %{name}-%{version}-70-updatecenters.patch
-# avoiding use svnkit
-Patch8: %{name}-%{version}-80-nosvnkit.patch
+Patch4: %{name}-%{version}@40-ide-launcher.patch 
+# Avoids releasing binary files
+Patch5: %{name}-%{version}@50-build-copy.patch 
+# Avoids using svnkit
+Patch6: %{name}-%{version}@60-nosvnkit.patch
+# Sets up IDE configuration
+Patch7: %{name}-%{version}@70-small-ide-cluster.patch
+# Disables the checkmoduleconfigs task
+Patch8: %{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
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -123,18 +158,19 @@ BuildRequires: %{nb_platform_pkg} >= %{v
 BuildRequires: lucene >= 2.3.1
 BuildRequires: unzip
 BuildRequires: desktop-file-utils
-BuildRequires: netbeans-javaparser = %{version}
+BuildRequires: netbeans-javaparser >= %{javaparser_ver}
 BuildRequires: xerces-j2 >= 2.7.1
 BuildRequires: appframework >= 1.03
 BuildRequires: beansbinding >= 1.2.1
 BuildRequires: freemarker >= 2.3.8
-BuildRequires: jsch >= 0.1.39
+BuildRequires: jsch
 BuildRequires: %{xml_resolver} >= %{xml_resolver_ver}
-BuildRequires: ini4j >= 0.3.2-4
+BuildRequires: ini4j
 BuildRequires: netbeans-svnclientadapter >= %{svnclientadapter_ver}
-BuildRequires: subversion-javahl >= 1.5.0
+BuildRequires: subversion-javahl
 BuildRequires: jakarta-commons-logging >= 1.0.4
 BuildRequires: jakarta-oro >= 2.0.8
+BuildRequires: jakarta-commons-net >= 1.4.1
 BuildRequires: %{nb_harness_pkg}    >= %{version}
 
 Requires: jpackage-utils
@@ -181,15 +217,16 @@ Group: Development/Tools
 Requires: jpackage-utils
 Requires: java >= 1:1.6.0
 Requires: %{nb_platform_pkg} >= %{version}
-Requires: jsch >= 0.1.39
+Requires: jsch
 Requires: %{xml_resolver} >= %{xml_resolver_ver}
-Requires: ini4j >= 0.3.2-4
+Requires: ini4j
 Requires: freemarker >= 2.3.8
 Requires: xerces-j2 >= 2.7.1
 Requires: netbeans-svnclientadapter >= %{version}
-Requires: subversion-javahl >= 1.5.0
+Requires: subversion-javahl
 Requires: jakarta-commons-logging >= 1.0.4
 Requires: jakarta-oro >= 2.0.8
+Requires: jakarta-commons-net >= 1.4.1
 # A requirement for the owner of the /usr/share/netbeans directory
 Requires: %{nb_platform_pkg}   >= %{version}
 
@@ -205,13 +242,13 @@ Requires: jpackage-utils
 Requires: java >= 1:1.6.0
 Requires: %{name}-%{nb_ide} >= %{version}
 Requires: java-sdk >= 1:1.6.0
-Requires: netbeans-javaparser = %{version}
+Requires: netbeans-javaparser >= %{javaparser_ver}
 Requires: appframework >= 1.03
 Requires: beansbinding >= 1.2.1
-Requires: ant >= 0:1.7.0
-Requires: ant-junit >= 0:1.7.0
-Requires: ant-nodeps >= 0:1.7.0
-Requires: ant-trax >= 0:1.7.0
+Requires: ant >= 1.7.0
+Requires: ant-junit >= 1.7.0
+Requires: ant-nodeps >= 1.7.0
+Requires: ant-trax >= 1.7.0
 # A requirement for the owner of the /usr/share/netbeans directory
 Requires: %{nb_platform_pkg}   >= %{version}
 
@@ -219,30 +256,19 @@ Requires: %{nb_platform_pkg}   >= %{vers
 Common libraries for the NetBeans Java IDE.
 
 %prep
-%setup -q
+%setup -q 
 
 find . -type f \( -iname "*.jar" -o -iname "*.zip" \) -print0 | xargs -t -0 %{__rm} -f
 find . -type f \( -iname "binaries-list" \) | xargs -t %{__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
-
-# 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".
-%{__ln_s} -f %{_javadir}/javahelp2.jar apisupport.harness/external/jsearch-2.0_05.jar
-%{__ln_s} -f %{_javadir}/javahelp2.jar javahelp/external/jh-2.0_05.jar
-
+# 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
-%{__ln_s} -f %{_javadir}/freemarker-2.3.jar libs.freemarker/external/freemarker-2.3.8.jar
 
 %patch0 -p1 -b .sav
 %patch1 -p1 -b .sav
@@ -253,37 +279,37 @@ jar cf swingapp/external/swing-worker-1.
 %patch6 -p1 -b .sav
 %patch7 -p1 -b .sav
 %patch8 -p1 -b .sav
+%patch9 -p1 -b .sav
 
 %build
 
 mkdir -p nbbuild/netbeans
 %{__ln_s} -f %{nb_platform_dir} nbbuild/netbeans/%{nb_platform}
+%{__ln_s} -f %{nb_harness_dir} nbbuild/netbeans/harness
 
 IDE_EXT_DIR=nbbuild/netbeans/%{nb_ide}/modules/ext
-%{__mkdir_p}  ${IDE_EXT_DIR}
-%{__ln_s} -f %{_javadir}/jsch.jar ${IDE_EXT_DIR}/jsch-0.1.39.jar
-%{__ln_s} -f %{xml_resolver_jar} ${IDE_EXT_DIR}/resolver-1.2.jar
-%{__ln_s} -f %{_javadir}/ini4j.jar  ${IDE_EXT_DIR}/ini4j-0.2.6.jar
+%{__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
-%{__ln_s} -f %{_javadir}/freemarker-2.3.jar  ${IDE_EXT_DIR}/freemarker-2.3.8.jar
-%{__ln_s} -f %{svnclientadapter_jar} ${IDE_EXT_DIR}/svnClientAdapter-1.4.0.jar
-%{__ln_s} -f %{_javadir}/svn-javahl.jar  ${IDE_EXT_DIR}/svnjavahl-1.5.0.jar
-%{__ln_s} -f %{_javadir}/xerces-j2.jar  ${IDE_EXT_DIR}/xerces-2.8.0.jar
-%{__ln_s} -f %{_javadir}/lucene.jar  ${IDE_EXT_DIR}/lucene-core-2.3.2.jar
-%{__ln_s} -f %{_javadir}/commons-logging.jar ${IDE_EXT_DIR}/commons-logging-1.0.4.jar
-%{__ln_s} -f %{_javadir}/jakarta-oro.jar ${IDE_EXT_DIR}/jakarta-oro-2.0.8.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 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
 
 JAVA_EXT_DIR=nbbuild/netbeans/%{nb_java}/modules/ext
-%{__mkdir_p}  ${JAVA_EXT_DIR}
-%{__ln_s} -f %{_javadir}/netbeans-javaparser-api-%{version}.jar ${JAVA_EXT_DIR}/javac-api-nb-7.0-b07.jar
-%{__ln_s} -f %{_javadir}/netbeans-javaparser-impl-%{version}.jar ${JAVA_EXT_DIR}/javac-impl-nb-7.0-b07.jar
-%{__ln_s} -f %{_javadir}/appframework.jar ${JAVA_EXT_DIR}/appframework-1.0.3.jar
-%{__ln_s} -f %{_javadir}/beansbinding.jar ${JAVA_EXT_DIR}/beansbinding-1.2.1.jar
-%{__ln_s} -f %{_javadir}/junit4.jar ${JAVA_EXT_DIR}/junit-4.5.jar
-%{__ln_s} -f %{_javadir}/junit.jar ${JAVA_EXT_DIR}/junit-3.8.2.jar
-
-%{__ln_s} -f %{nb_harness_dir} nbbuild/netbeans/harness
+%{__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 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} \
@@ -304,15 +330,15 @@ sed --in-place "s|<nb_icon>|%{nb_icon}|g
 sed --in-place "s|<nb_launcher>|%{nb_launcher}|g" %{nb_desktop}
 
 # clean up links to ext jars for the ide module
-%{__rm} -f ${IDE_EXT_DIR}/jsch-0.1.39.jar
+%{__rm} -f ${IDE_EXT_DIR}/jsch-0.1.41.jar
 %{__rm} -f ${IDE_EXT_DIR}/resolver-1.2.jar
-%{__rm} -f ${IDE_EXT_DIR}/ini4j-0.2.6.jar
+%{__rm} -f ${IDE_EXT_DIR}/ini4j-%{ini4j_ver}.jar
 %{__rm} -f ${IDE_EXT_DIR}/freemarker-2.3.8.jar
-%{__rm} -f ${IDE_EXT_DIR}/svnClientAdapter-1.4.0.jar
-%{__rm} -f ${IDE_EXT_DIR}/svnjavahl-1.5.0.jar
+%{__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}/commons-logging-1.0.4.jar
+%{__rm} -f ${IDE_EXT_DIR}/commons-logging-%{commons_logging_ver}.jar
 %{__rm} -f ${IDE_EXT_DIR}/jakarta-oro-2.0.8.jar
 
 # clean up links to ext jars for the java module
@@ -323,9 +349,6 @@ sed --in-place "s|<nb_launcher>|%{nb_lau
 %{__rm} -f ${JAVA_EXT_DIR}/junit-4.5.jar
 %{__rm} -f ${JAVA_EXT_DIR}/junit-3.8.2.jar
 
-# clean up the stub jar
-%{__rm} -f ${JAVA_EXT_DIR}/swing-worker-1.1.jar
-
 %install
 
 # Installs the specified source(s) in the destination directory.
@@ -351,18 +374,18 @@ install_package %{buildroot}%{nb_ide_dir
 
 # linking the ide to the external JARs
 IDE_EXT_DIR=%{buildroot}%{nb_ide_dir}/modules/ext
-%{__ln_s} -f %{_javadir}/jsch.jar ${IDE_EXT_DIR}/jsch-0.1.39.jar
-%{__ln_s} -f %{xml_resolver_jar} ${IDE_EXT_DIR}/resolver-1.2.jar
-%{__ln_s} -f %{_javadir}/ini4j.jar  ${IDE_EXT_DIR}/ini4j-0.2.6.jar
+%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
-%{__ln_s} -f %{_javadir}/freemarker-2.3.jar  ${IDE_EXT_DIR}/freemarker-2.3.8.jar
-%{__ln_s} -f %{svnclientadapter_jar} ${IDE_EXT_DIR}/svnClientAdapter-1.4.0.jar
-%{__ln_s} -f %{_javadir}/svn-javahl.jar  ${IDE_EXT_DIR}/svnjavahl-1.5.0.jar
-%{__ln_s} -f %{_javadir}/xerces-j2.jar  ${IDE_EXT_DIR}/xerces-2.8.0.jar
-%{__ln_s} -f %{_javadir}/lucene.jar  ${IDE_EXT_DIR}/lucene-core-2.3.2.jar
-%{__ln_s} -f %{_javadir}/commons-logging.jar ${IDE_EXT_DIR}/commons-logging-1.0.4.jar
-%{__ln_s} -f %{_javadir}/jakarta-oro.jar ${IDE_EXT_DIR}/jakarta-oro-2.0.8.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 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
 
 # Install java
 install_package %{buildroot}%{nb_java_dir} nbbuild/netbeans/%{nb_java}/*
@@ -373,18 +396,19 @@ install -d -m 755 %{buildroot}%{nb_java_
 
 # linking the java to the external JARs
 JAVA_EXT_DIR=%{buildroot}%{nb_java_dir}/modules/ext
-%{__ln_s} -f %{_javadir}/netbeans-javaparser-api-%{version}.jar ${JAVA_EXT_DIR}/javac-api-nb-7.0-b07.jar
-%{__ln_s} -f %{_javadir}/netbeans-javaparser-impl-%{version}.jar ${JAVA_EXT_DIR}/javac-impl-nb-7.0-b07.jar
-%{__ln_s} -f %{_javadir}/appframework.jar ${JAVA_EXT_DIR}/appframework-1.0.3.jar
-%{__ln_s} -f %{_javadir}/beansbinding.jar ${JAVA_EXT_DIR}/beansbinding-1.2.1.jar
-%{__ln_s} -f %{_javadir}/junit4.jar ${JAVA_EXT_DIR}/junit-4.5.jar
-%{__ln_s} -f %{_javadir}/junit.jar ${JAVA_EXT_DIR}/junit-3.8.2.jar
+%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 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
+%lnSysJAR junit.jar ${JAVA_EXT_DIR}/junit-3.8.2.jar
 
+# linking the Ant components
 JAVA_ANT_DIR=%{buildroot}%{nb_java_dir}/ant
 %{__ln_s} -f %{ant_bin_dir}/ant ${JAVA_ANT_DIR}/bin/ant
 %{__ln_s} -f %{ant_bin_dir}/antRun ${JAVA_ANT_DIR}/bin/antRun
 %{__ln_s} -f %{ant_etc_dir} ${JAVA_ANT_DIR}/etc
-
+# - jars
 %{__ln_s} -f %{ant_lib_dir}/ant.jar ${JAVA_ANT_DIR}/lib/ant.jar
 %{__ln_s} -f %{ant_lib_dir}/ant-launcher.jar ${JAVA_ANT_DIR}/lib/ant-launcher.jar
 %{__ln_s} -f %{ant_lib_dir2}/ant-junit.jar ${JAVA_ANT_DIR}/lib/ant-junit.jar
@@ -445,97 +469,26 @@ fi
 %dir %{_datadir}/applications/%{nb_org}/
 %{nb_nb_dir}/.noautoupdate
 %{_datadir}/applications/%{nb_org}/%{nb_desktop}
+%doc LICENSE.txt README.txt
 
 %files %{nb_apisupport}
 %defattr(-,root,root,-)
 %{nb_apisupport_dir}/
 %{nb_apisupport_dir}/.noautoupdate
-%doc nbbuild/standard-nbm-license.txt
+%doc LICENSE.txt
 
 %files %{nb_ide}
 %defattr(-,root,root,-)
 %{nb_ide_dir}/
 %{nb_ide_dir}/.noautoupdate
-%doc nbbuild/standard-nbm-license.txt
+%doc LICENSE.txt
 
 %files %{nb_java}
 %defattr(-,root,root,-)
 %{nb_java_dir}/
 %{nb_java_dir}/.noautoupdate
-%doc nbbuild/standard-nbm-license.txt
+%doc LICENSE.txt
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.5-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Feb 04 2009 Victor Vasilyev <victor.vasilyev at sun.com> 6.5-2
-- Bug #483384 - "netbeans : Unowned directories" is fixed.
-  Dependencies on the netbeans-platform package are added for both ide and java subpackages.
-
-* Tue Dec 09 2008 Victor Vasilyev <victor.vasilyev at sun.com> 6.5-1
-- Bootstrapping of the spec for IDE of the NetBeans 6.5
-- Removing of all binaries-list files
-- New dependency on jakarta-oro-2.0.8.jar is added
-- The Distribution tag is removed
-- jsch 0.1.24 -> 0.1.39
-- lucene 2.2.0 -> 2.3.1 (2.3.2)
-- netbeans-javaparser 6.1 -> 6.5
-- junit4 4.1 -> 4.5
-- netbeans-platform9 -> netbeans-platform
-- netbeans-platform9-harness -> netbeans-platform-harness
-- BR netbeans-platform-harness
-- svnClientAdapter 0.9.23 -> 1.4.0
-- B(R) subversion-javahl >= 1.5.0
-- Creation of the .noautoupdate files is  moved to the install section
-
-* Tue Nov 25 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-10
-- Explicit dependencies on the jakarta-commons-logging package are added (#472825).
-- Summary is fixed according to the request of the Richard Hughes <hughsient at gmail.com>.
-- Call of the brp-java-repack-jars script is disabled.
-- The deprecated key "Encoding" is removed from the desktop file template.
-
-* Wed Oct 22 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-9
-- Unset the DESKTOP_STARTUP_ID environment variable (#467546). The netbeans-6.1-50-ide-launcher.patch is modified.
-
-* Thu Oct 09 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-8
-- Update center - NetBeans is disabled, update center - NetBeans for Fedora is added (#466179)
-- Some cosmetics
-
-* Tue Oct 07 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-7
-- Dependency upon java-sdk is added instead of java-1.6.0-openjdk (#464558, # 465891)
-
-* Wed Oct 01 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-6
-- Showing an incorrect EULA at startup is disabled (#464820). The netbeans-6.1-50-ide-launcher.patch is modified.
-
-* Mon Sep 15 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-5
-- A location of the productid file is changed
-- The swingapp module is removed from the small IDE configuration (netbeans-6.1-60-small-ide-config.patch)
-
-* Tue Sep 09 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-4
-- The java, java-devel and jpackage-utils requirenments are used
-
-* Mon Sep 08 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-3
-- The symlink locations for both java2/ant/ant/bin/antRun and java2/ant/ant/etc are corrected (#456337#c9)
-- Linking to the external JARs is moved to the %%install script from the %%post (#456337#c9)
-- The requires for a version of the ini4j package are corrected (#456337#c9)
-- The %%description content for the NetBeans IDE is updated (#456337#c9)
-- Canonical value for %%defattr is used everywhere
-
-* Tue Jul 29 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-2
-- rpmlint warnings about hidden .noautoupdate files are supressed
-- Package dependencies are adjusted
-- Relative links are used
-- The alternatives system is used to run netbeans
-- Group is changed
-- nb_distro_id is added
-- The %%{buildroot} is used everywhere instead of $RPM_BUILD_ROOT
-- A version requirement for the xerces-j2 is decreased from 2.8.0 up to 2.7.1
-- The warnings about links to external JARs are suppressed
-- Redundant stub swing-worker-1.1.jar is removed
-- The standard-nbm-license.txt is added to all subpackages
-
-* Fri Jun 06 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-1
-- Initial version
+* 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.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Jan 2009 16:53:06 -0000	1.3
+++ sources	14 Aug 2009 08:48:53 -0000	1.4
@@ -1 +1 @@
-836d358b43f76c01cca10b943e7cd718  netbeans-6.5-200811100001-base-src-linux.tar.gz
+5a38c0539b82027eeea8b16ed1065e95  netbeans-6.7.1-200907230233-base-src-linux.tar.gz


--- netbeans-6.5-00-copy-build.patch DELETED ---


--- netbeans-6.5-10-ant-external-build.patch DELETED ---


--- netbeans-6.5-20-ant-build.patch DELETED ---


--- netbeans-6.5-30-parse-project-xml.patch DELETED ---


--- netbeans-6.5-40-build-xml.patch DELETED ---


--- netbeans-6.5-50-ide-launcher.patch DELETED ---


--- netbeans-6.5-60-small-ide-config.patch DELETED ---


--- netbeans-6.5-70-updatecenters.patch DELETED ---


--- netbeans-6.5-80-nosvnkit.patch DELETED ---


