rpms/netbeans/devel import.log, NONE, 1.1 netbeans-6.1-00-copy-build.patch, NONE, 1.1 netbeans-6.1-10-ant-external-build.patch, NONE, 1.1 netbeans-6.1-20-ant-build.patch, NONE, 1.1 netbeans-6.1-30-parse-project-xml.patch, NONE, 1.1 netbeans-6.1-40-build-xml.patch, NONE, 1.1 netbeans-6.1-50-ide-launcher.patch, NONE, 1.1 netbeans-6.1-60-small-ide-config.patch, NONE, 1.1 netbeans-ide.desktop-template, NONE, 1.1 netbeans.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Victor G. Vasilyev
victorv at fedoraproject.org
Wed Sep 10 00:38:07 UTC 2008
Author: victorv
Update of /cvs/pkgs/rpms/netbeans/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30146/devel
Modified Files:
.cvsignore sources
Added Files:
import.log netbeans-6.1-00-copy-build.patch
netbeans-6.1-10-ant-external-build.patch
netbeans-6.1-20-ant-build.patch
netbeans-6.1-30-parse-project-xml.patch
netbeans-6.1-40-build-xml.patch
netbeans-6.1-50-ide-launcher.patch
netbeans-6.1-60-small-ide-config.patch
netbeans-ide.desktop-template netbeans.spec
Log Message:
Initial version
--- NEW FILE import.log ---
netbeans-6_1-4_fc10:HEAD:netbeans-6.1-4.fc10.src.rpm:1221007047
netbeans-6.1-00-copy-build.patch:
--- NEW FILE netbeans-6.1-00-copy-build.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/junit/nbproject/project.properties netbeans-6.1.new/junit/nbproject/project.properties
--- netbeans-6.1/junit/nbproject/project.properties 2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/junit/nbproject/project.properties 2008-06-16 17:56:43.000000000 +0400
@@ -42,9 +42,9 @@
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.1.jar=modules/ext/junit-4.1.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.1.jar=modules/ext/junit-4.1.jar
jnlp.indirect.jars=\
docs/junit-3.8.2-api.zip,\
modules/ext/junit*.jar
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/libs.commons_logging/nbproject/project.properties netbeans-6.1.new/libs.commons_logging/nbproject/project.properties
--- netbeans-6.1/libs.commons_logging/nbproject/project.properties 2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/libs.commons_logging/nbproject/project.properties 2008-06-16 17:56:43.000000000 +0400
@@ -38,4 +38,4 @@
# made subject to such option by the copyright holder.
is.autoload=true
-release.external/commons-logging-1.0.4.jar=modules/ext/commons-logging-1.0.4.jar
+#release.external/commons-logging-1.0.4.jar=modules/ext/commons-logging-1.0.4.jar
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/libs.freemarker/nbproject/project.properties netbeans-6.1.new/libs.freemarker/nbproject/project.properties
--- netbeans-6.1/libs.freemarker/nbproject/project.properties 2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/libs.freemarker/nbproject/project.properties 2008-06-16 17:56:43.000000000 +0400
@@ -41,5 +41,5 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.5
-release.external/freemarker-2.3.8.jar=modules/ext/freemarker-2.3.8.jar
+#release.external/freemarker-2.3.8.jar=modules/ext/freemarker-2.3.8.jar
module.jar.verifylinkageignores=freemarker.((ext.ant.FreemarkerXmlTask)|(template.DefaultObjectWrapper))
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/libs.ini4j/nbproject/project.properties netbeans-6.1.new/libs.ini4j/nbproject/project.properties
--- netbeans-6.1/libs.ini4j/nbproject/project.properties 2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/libs.ini4j/nbproject/project.properties 2008-06-16 17:56:43.000000000 +0400
@@ -38,7 +38,7 @@
# made subject to such option by the copyright holder.
is.autoload=true
-release.external/ini4j-0.2.6.jar=modules/ext/ini4j-0.2.6.jar
+#release.external/ini4j-0.2.6.jar=modules/ext/ini4j-0.2.6.jar
module.jar.verifylinkageignores=org.ini4j.IniPreferencesFactoryListener
# Fatal error: class javax.servlet.ServletContextListener not found
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/libs.javacapi/nbproject/project.properties netbeans-6.1.new/libs.javacapi/nbproject/project.properties
--- netbeans-6.1/libs.javacapi/nbproject/project.properties 2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/libs.javacapi/nbproject/project.properties 2008-06-16 17:56:43.000000000 +0400
@@ -44,6 +44,6 @@
nbm.homepage=http://jackpot.netbeans.org/
nbm.module.author=Petr Hrebejk, Sun Microsystems, Inc.
spec.version.base=0.6.0
-release.external/javac-api-nb-7.0-b07.jar=modules/ext/javac-api-nb-7.0-b07.jar
+#release.external/javac-api-nb-7.0-b07.jar=modules/ext/javac-api-nb-7.0-b07.jar
javadoc.arch=${basedir}/arch.xml
module.javadoc.packages=com.sun.source.tree,com.sun.source.util
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/libs.javacimpl/nbproject/project.properties netbeans-6.1.new/libs.javacimpl/nbproject/project.properties
--- netbeans-6.1/libs.javacimpl/nbproject/project.properties 2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/libs.javacimpl/nbproject/project.properties 2008-06-16 17:56:43.000000000 +0400
@@ -41,7 +41,7 @@
nbm.homepage=http://jackpot.netbeans.org/
nbm.module.author=Petr Hrebejk, Sun Microsystems, Inc.
spec.version.base=0.8.0
-release.external/javac-impl-nb-7.0-b07.jar=modules/ext/javac-impl-nb-7.0-b07.jar
+#release.external/javac-impl-nb-7.0-b07.jar=modules/ext/javac-impl-nb-7.0-b07.jar
javadoc.arch=${basedir}/arch.xml
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/libs.jna/nbproject/project.properties netbeans-6.1.new/libs.jna/nbproject/project.properties
--- netbeans-6.1/libs.jna/nbproject/project.properties 2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/libs.jna/nbproject/project.properties 2008-06-16 17:56:43.000000000 +0400
@@ -37,4 +37,4 @@
# Version 2 license, then the option applies only if the new code is
# made subject to such option by the copyright holder.
-release.external/jna-3.0.2.jar=modules/ext/jna-3.0.2.jar
+#release.external/jna-3.0.2.jar=modules/ext/jna-3.0.2.jar
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/libs.jsch/nbproject/project.properties netbeans-6.1.new/libs.jsch/nbproject/project.properties
--- netbeans-6.1/libs.jsch/nbproject/project.properties 2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/libs.jsch/nbproject/project.properties 2008-06-16 17:56:43.000000000 +0400
@@ -38,4 +38,4 @@
# made subject to such option by the copyright holder.
is.autoload=true
-release.external/jsch-0.1.24.jar=modules/ext/jsch-0.1.24.jar
+#release.external/jsch-0.1.24.jar=modules/ext/jsch-0.1.24.jar
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/libs.lucene/nbproject/project.properties netbeans-6.1.new/libs.lucene/nbproject/project.properties
--- netbeans-6.1/libs.lucene/nbproject/project.properties 2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/libs.lucene/nbproject/project.properties 2008-06-16 17:56:43.000000000 +0400
@@ -38,4 +38,4 @@
# made subject to such option by the copyright holder.
is.autoload=true
-release.external/lucene-core-2.2.0.jar=modules/ext/lucene-core-2.2.0.jar
+#release.external/lucene-core-2.2.0.jar=modules/ext/lucene-core-2.2.0.jar
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/libs.svnClientAdapter/nbproject/project.properties netbeans-6.1.new/libs.svnClientAdapter/nbproject/project.properties
--- netbeans-6.1/libs.svnClientAdapter/nbproject/project.properties 2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/libs.svnClientAdapter/nbproject/project.properties 2008-06-16 17:56:43.000000000 +0400
@@ -39,7 +39,7 @@
is.autoload=true
-release.external/svnClientAdapter-0.9.23.jar=modules/ext/svnClientAdapter-0.9.23.jar
+#release.external/svnClientAdapter-0.9.23.jar=modules/ext/svnClientAdapter-0.9.23.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.1/libs.xerces/nbproject/project.properties netbeans-6.1.new/libs.xerces/nbproject/project.properties
--- netbeans-6.1/libs.xerces/nbproject/project.properties 2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/libs.xerces/nbproject/project.properties 2008-06-16 17:56:43.000000000 +0400
@@ -38,5 +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
+#release.external/xerces-2.8.0.jar=modules/ext/xerces-2.8.0.jar
module.jar.verifylinkageignores=org.apache.xerces.util.XMLCatalogResolver
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/o.apache.xml.resolver/nbproject/project.properties netbeans-6.1.new/o.apache.xml.resolver/nbproject/project.properties
--- netbeans-6.1/o.apache.xml.resolver/nbproject/project.properties 2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/o.apache.xml.resolver/nbproject/project.properties 2008-06-16 17:56:43.000000000 +0400
@@ -38,4 +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
+#release.external/resolver-1.2.jar=modules/ext/resolver-1.2.jar
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/o.jdesktop.beansbinding/nbproject/project.properties netbeans-6.1.new/o.jdesktop.beansbinding/nbproject/project.properties
--- netbeans-6.1/o.jdesktop.beansbinding/nbproject/project.properties 2008-06-16 17:52:15.000000000 +0400
+++ netbeans-6.1.new/o.jdesktop.beansbinding/nbproject/project.properties 2008-06-16 17:57:13.000000000 +0400
@@ -38,6 +38,6 @@
# 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
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/swingapp/nbproject/project.properties netbeans-6.1.new/swingapp/nbproject/project.properties
--- netbeans-6.1/swingapp/nbproject/project.properties 2008-06-16 17:50:32.000000000 +0400
+++ netbeans-6.1.new/swingapp/nbproject/project.properties 2008-06-16 17:56:43.000000000 +0400
@@ -1,5 +1,5 @@
-extra.module.files=modules/ext/appframework-1.0.3.jar,\
- docs/appframework-1.0.3-doc.zip,\
- modules/ext/swing-worker-1.1.jar
+#extra.module.files=modules/ext/appframework-1.0.3.jar,\
+# docs/appframework-1.0.3-doc.zip,\
+# modules/ext/swing-worker-1.1.jar
jnlp.indirect.jars=docs/appframework-1.0.3-doc.zip
javac.source=1.5
netbeans-6.1-10-ant-external-build.patch:
--- NEW FILE netbeans-6.1-10-ant-external-build.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-new-source/o.apache.tools.ant.module/external/build.xml netbeans-new-source.new/o.apache.tools.ant.module/external/build.xml
--- netbeans-new-source/o.apache.tools.ant.module/external/build.xml 2008-04-21 18:43:38.000000000 +0400
+++ netbeans-new-source.new/o.apache.tools.ant.module/external/build.xml 2008-06-10 19:17:52.000000000 +0400
@@ -42,7 +42,7 @@
-->
<project name="o.apache.tools.ant.module/external" default="unzip" basedir=".">
<target name="unzip">
- <unzip src="ant-libs-1.7.0.zip" dest="lib"/>
+ <!--unzip src="ant-libs-1.7.0.zip" dest="lib"/-->
</target>
<target name="clean">
<delete dir="lib"/>
netbeans-6.1-20-ant-build.patch:
--- NEW FILE netbeans-6.1-20-ant-build.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-new-source/o.apache.tools.ant.module/build.xml netbeans-new-source.new/o.apache.tools.ant.module/build.xml
--- netbeans-new-source/o.apache.tools.ant.module/build.xml 2008-04-21 18:43:38.000000000 +0400
+++ netbeans-new-source.new/o.apache.tools.ant.module/build.xml 2008-06-10 19:24:03.000000000 +0400
@@ -75,21 +75,6 @@
</target>
<target name="release" depends="init">
- <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="netbeans-extra" depends="jar-bridge,release"/>
netbeans-6.1-30-parse-project-xml.patch:
--- NEW FILE netbeans-6.1-30-parse-project-xml.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java netbeans-6.1.new/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java
--- netbeans-6.1/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java 2008-04-21 18:43:38.000000000 +0400
+++ netbeans-6.1.new/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java 2008-06-11 20:55:03.000000000 +0400
@@ -1198,6 +1198,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.1-40-build-xml.patch:
--- NEW FILE netbeans-6.1-40-build-xml.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-new-source/nbbuild/build.xml netbeans-new-source.new/nbbuild/build.xml
--- netbeans-new-source/nbbuild/build.xml 2008-04-21 18:43:38.000000000 +0400
+++ netbeans-new-source.new/nbbuild/build.xml 2008-06-10 19:36:52.000000000 +0400
@@ -584,8 +584,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" />
- <copy file="../ide/launcher/windows/nb.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.1-50-ide-launcher.patch:
--- NEW FILE netbeans-6.1-50-ide-launcher.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-new-source/ide/launcher/unix/netbeans netbeans-new-source.new/ide/launcher/unix/netbeans
--- netbeans-new-source/ide/launcher/unix/netbeans 2008-03-26 18:55:01.000000000 +0300
+++ netbeans-new-source.new/ide/launcher/unix/netbeans 2008-06-10 19:44:30.000000000 +0400
@@ -54,16 +54,18 @@
fi
done
-progdir=`dirname "$PRG"`
+#progdir=`dirname "$PRG"`
+# Patch for Debian/Ubuntu where launcher is in /usr/bin
+progdir=/usr/share/netbeans/6.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 "$@"
netbeans-6.1-60-small-ide-config.patch:
--- NEW FILE netbeans-6.1-60-small-ide-config.patch ---
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/form.kit/nbproject/project.xml netbeans-6.1.new/form.kit/nbproject/project.xml
--- netbeans-6.1/form.kit/nbproject/project.xml 2008-06-16 17:33:03.000000000 +0400
+++ netbeans-6.1.new/form.kit/nbproject/project.xml 2008-06-16 17:36:44.000000000 +0400
@@ -12,13 +12,13 @@
<specification-version>1.22</specification-version>
</run-dependency>
</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-->
<dependency>
<code-name-base>org.netbeans.modules.i18n.form</code-name-base>
<run-dependency>
@@ -26,12 +26,12 @@
<specification-version>1.21</specification-version>
</run-dependency>
</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-->
<dependency>
<code-name-base>org.netbeans.modules.java.kit</code-name-base>
<run-dependency>
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/ide.kit/nbproject/project.xml netbeans-6.1.new/ide.kit/nbproject/project.xml
--- netbeans-6.1/ide.kit/nbproject/project.xml 2008-06-16 17:33:03.000000000 +0400
+++ netbeans-6.1.new/ide.kit/nbproject/project.xml 2008-06-16 17:36:44.000000000 +0400
@@ -130,13 +130,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.ide.branding</code-name-base>
<run-dependency>
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/java.kit/nbproject/project.xml netbeans-6.1.new/java.kit/nbproject/project.xml
--- netbeans-6.1/java.kit/nbproject/project.xml 2008-06-16 17:33:03.000000000 +0400
+++ netbeans-6.1.new/java.kit/nbproject/project.xml 2008-06-16 17:37:41.000000000 +0400
@@ -66,13 +66,13 @@
<specification-version>1.6</specification-version>
</run-dependency>
</dependency>
- <dependency>
+ <!--dependency>
<code-name-base>org.netbeans.modules.java.examples</code-name-base>
<run-dependency>
<release-version>1</release-version>
<specification-version>1.6</specification-version>
</run-dependency>
- </dependency>
+ </dependency-->
<dependency>
<code-name-base>org.netbeans.modules.java.freeform</code-name-base>
<run-dependency>
@@ -169,7 +169,7 @@
<specification-version>1.1</specification-version>
</run-dependency>
</dependency>
- <dependency>
+ <!--dependency>
<code-name-base>org.netbeans.modules.websvc.jaxws21</code-name-base>
<run-dependency>
<release-version>1</release-version>
@@ -187,7 +187,7 @@
<run-dependency>
<specification-version>1.0</specification-version>
</run-dependency>
- </dependency>
+ </dependency-->
</module-dependencies>
<public-packages/>
</data>
diff -Nur -x '*.orig' -x '*~' netbeans-6.1/nbbuild/cluster.properties netbeans-6.1.new/nbbuild/cluster.properties
--- netbeans-6.1/nbbuild/cluster.properties 2008-06-16 17:33:03.000000000 +0400
+++ netbeans-6.1.new/nbbuild/cluster.properties 2008-06-16 17:36:44.000000000 +0400
@@ -231,14 +231,6 @@
api.xml,\
classfile,\
core.ide,\
- db,\
- db.core,\
- db.drivers,\
- db.kit, \
- db.mysql, \
- db.sql.editor,\
- db.sql.visualeditor,\
- dbapi,\
defaults,\
diff,\
editor,\
@@ -263,7 +255,6 @@
editor.util,\
extbrowser,\
gototest,\
- httpserver,\
ide.kit,\
image,\
jumpto,\
@@ -300,7 +291,6 @@
refactoring.api,\
schema2beans,\
server,\
- servletapi,\
spi.debugger.ui,\
spi.editor.hints,\
spi.navigator,\
@@ -319,7 +309,6 @@
versioning,\
versioning.system.cvss,\
versioning.util,\
- web.flyingsaucer,\
xml,\
xml.axi,\
xml.catalog,\
@@ -334,8 +323,7 @@
xml.tools,\
xml.wsdl.model,\
xml.xam,\
- xml.xdm,\
- xsl
+ xml.xdm
nb.cluster.java.dir=java2
nb.cluster.java.depends=\
@@ -349,27 +337,19 @@
ant.kit,\
api.debugger.jpda,\
api.java,\
- beans,\
- dbschema,\
+ beans,\
debugger.jpda,\
debugger.jpda.ant,\
debugger.jpda.projects,\
debugger.jpda.ui,\
- derby,\
form,\
- form.j2ee,\
form.kit,\
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,\
@@ -395,16 +375,10 @@
junit,\
libs.javacapi,\
libs.javacimpl,\
- libs.springframework,\
o.apache.tools.ant.module,\
o.jdesktop.beansbinding,\
refactoring.java,\
- spring.beans,\
swingapp,\
- websvc.jaxws21,\
- websvc.jaxws21api,\
- websvc.serviceapi,\
- xml.jaxb, \
xml.tools.java
nb.cluster.xml.dir=xml2
--- NEW FILE netbeans-ide.desktop-template ---
[Desktop Entry]
Encoding=UTF-8
Type=Application
Version=1.0
Name=NetBeans IDE <nb_ver>
GenericName=Integrated Development Environment (IDE)
Comment=The only IDE you need!
Icon=<nb_icon>
TryExec=<nb_launcher>
Exec=<nb_launcher>
Terminal=false
Categories=Development;Java;IDE;
StartupNotify=true
--- NEW FILE netbeans.spec ---
%define __alternatives %{_sbindir}/alternatives
%define nb_ netbeans
%define nb_org %{nb_}.org
%define nb_ver 6.1
%define nb_alt_priority 610
%define nb_release_time 200805300101
%define nb_home %{_datadir}/%{nb_}
%define nb_dir %{nb_home}/%{nb_ver}
%define nb_platform_ver 8
%define nb_platform platform%{nb_platform_ver}
%define nb_platform_dir %{nb_home}/%{nb_platform}
%define nb_platform_pkg %{nb_}-%{nb_platform}
%define nb_harness harness
%define nb_harness_dir %{nb_home}/%{nb_harness}
%define nb_harness_pkg %{nb_}-%{nb_platform}-%{nb_harness}
%define nb_ide_ver 9
%define nb_ide ide%{nb_ide_ver}
%define nb_ide_dir %{nb_home}/%{nb_ide}
%define nb_ide_pkg %{nb_}-%{nb_ide}
%define nb_java_ver 2
%define nb_java java%{nb_java_ver}
%define nb_java_dir %{nb_home}/%{nb_java}
%define nb_java_pkg %{nb_}-%{nb_java}
%define nb_apisupport_ver 1
%define nb_apisupport apisupport%{nb_apisupport_ver}
%define nb_apisupport_dir %{nb_home}/%{nb_apisupport}
%define nb_apisupport_pkg %{nb_}-%{nb_apisupport}
%define nb_nb nb%{nb_ver}
%define nb_nb_dir %{nb_dir}/%{nb_nb}
%define nb_bin_dir %{nb_dir}/bin
%define nb_etc_dir %{nb_dir}/etc
%define nb_config_dir %{nb_dir}/config
# 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
# Remove artifacts created by the noautoupdate macro.
# %1 the directory has been prevented for autoupdate.
%define rm_noautoupdate() %{__rm} -rf %1/.noautoupdate
%define cluster basic
%define nb_icon %{nb_nb_dir}/netbeans.png
%define nb_launcher %{nb_bin_dir}/netbeans
%define nb_desktop %{name}-ide-%{version}.desktop
%define compiler_opt -Dbuild.compiler.deprecation=false -Dbuild.compiler.debug=false
%define jdk_opt -Dpermit.jdk6.builds=true
%define verify_opt -Dverify.checkout=false
%define ant_nb_opt %{ant} %{jdk_opt} %{compiler_opt} %{verify_opt}
# Layout defined by ant-1.7.0-1jpp.4.fc9.rpm
%define ant_bin_dir /usr/bin
%define ant_etc_dir %{_datadir}/ant/etc
%define ant_lib_dir %{_datadir}/java
%define ant_lib_dir2 %{_datadir}/java/ant
# Used xml resolver
%define xml_resolver netbeans-resolver
%define xml_resolver_ver %{nb_ver}
%define xml_resolver_jar %{_javadir}/%{xml_resolver}-%{xml_resolver_ver}.jar
# Used netbeans-svnclientadapter-6.1.jar
%define svnclientadapter netbeans-svnclientadapter
%define svnclientadapter_ver %{nb_ver}
%define svnclientadapter_jar %{_javadir}/%{svnclientadapter}-%{svnclientadapter_ver}.jar
Name: %{nb_}
Version: %{nb_ver}
Release: 4%{?dist}
Summary: Integrated Development Environment (IDE)
Group: Development/Tools
License: GPLv2 with exceptions or CDDL
Vendor: netbeans.org
URL: http://www.netbeans.org
Distribution: %{nb_}-%{nb_ver}
Source0: http://nbi.netbeans.org/files/documents/210/2056/%{nb_}-%{nb_ver}-%{nb_release_time}-%{cluster}_cluster-src.zip
Source1: %{name}-ide-launcher.zip
Source2: %{name}-ide.desktop-template
%define nb_desktop_template %{SOURCE2}
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
Patch5: %{name}-%{version}-50-ide-launcher.patch
Patch6: %{name}-%{version}-60-small-ide-config.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: jpackage-utils
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: ant >= 0:1.7.0
BuildRequires: ant-junit >= 0:1.7.0
BuildRequires: ant-nodeps >= 0:1.7.0
BuildRequires: ant-trax >= 0:1.7.0
BuildRequires: junit >= 0:3.8.2
BuildRequires: junit4 >= 0:4.3.1
BuildRequires: swing-layout >= 0:1.0
BuildRequires: javahelp2 >= 2.0.05
# BuildRequires: jna >= 0:3.0.2 It is provided by nb_platform
BuildRequires: %{nb_platform_pkg} >= %{version}
BuildRequires: lucene >= 0:2.3.0
BuildRequires: unzip
BuildRequires: desktop-file-utils
BuildRequires: netbeans-javaparser >= %{version}
BuildRequires: xerces-j2 >= 2.7.1
BuildRequires: appframework >= 1.03
BuildRequires: beansbinding >= 1.2.1
BuildRequires: freemarker >= 2.3.8
BuildRequires: jsch >= 0.1.24
BuildRequires: %{xml_resolver} >= %{xml_resolver_ver}
BuildRequires: ini4j >= 0.3.2-4
BuildRequires: netbeans-svnclientadapter >= %{version}
Requires: jpackage-utils
Requires: java >= 1:1.6.0
# Requires: swing-layout >= 0:1.0
# Requires: javahelp2 >= 2.0.05 It is provided by nb_platform
# Requires: jna >= 0:3.0.2 It is provided by nb_platform
Requires: %{nb_apisupport_pkg} >= %{version}
Requires: %{nb_harness_pkg} >= %{version}
Requires: %{nb_ide_pkg} >= %{version}
Requires: %{nb_java_pkg} >= %{version}
Requires: %{nb_platform_pkg} >= %{version}
Requires: lucene >= 0:2.3.0
Requires: junit >= 0:3.8.2
Requires: junit4 >= 0:4.3.1
%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
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
user needs. Please, visit http://www.netbeans.org/ for more information about
this open-source project.
%package %{nb_apisupport}
Summary: Common NetBeans Platform Development Related Libraries for NetBeans
Group: Development/Tools
Requires: jpackage-utils
Requires: java >= 1:1.6.0
Requires: %{nb_ide_pkg} = %{version}-%{release}
Requires: %{nb_java_pkg} = %{version}-%{release}
Requires: %{nb_platform_pkg} = %{version}
Requires: %{nb_harness_pkg} = %{version}
Provides: libnb-%{nb_apisupport} = %{version}
%description %{nb_apisupport}
Common libraries for development of NetBeans Platform modular extensions.
%package %{nb_ide}
Summary: Integrated Development Environment (IDE) Libraries for NetBeans
Group: Development/Tools
Requires: jpackage-utils
Requires: java >= 1:1.6.0
Requires: %{nb_platform_pkg} >= %{version}
Requires: jsch >= 0.1.24
Requires: %{xml_resolver} >= %{xml_resolver_ver}
Requires: ini4j >= 0.3.2-4
Requires: freemarker >= 2.3.8
Requires: xerces-j2 >= 2.7.1
Requires: netbeans-svnclientadapter >= %{version}
Provides: libnb-%{nb_ide} = %{version}
%description %{nb_ide}
Common languages independent libraries for use in the IDE.
%package %{nb_java}
Summary: Common Java Related Libraries for NetBeans
Group: Development/Tools
Requires: jpackage-utils
Requires: java >= 1:1.6.0
Requires: %{name}-%{nb_ide} >= %{version}
Requires: java-1.6.0-openjdk >= 1:1.6.0
Requires: netbeans-javaparser = %{version}
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
Provides: libnb-%{nb_java} = %{version}
%description %{nb_java}
Common libraries for the NetBeans Java IDE.
%prep
%setup -q -c
%setup -q -T -D -a 1
find . -type d -print0 | xargs -t -0 chmod 755
find . -type f -print0 | xargs -t -0 chmod 644
find . -type f \( -iname "*.jar" -o -iname "*.zip" \) -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
# 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
%{__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
%patch2 -p1 -b .sav
%patch3 -p1 -b .sav
%patch4 -p1 -b .sav
%patch5 -p1 -b .sav
%patch6 -p1 -b .sav
%build
mkdir -p nbbuild/netbeans
%{__ln_s} -f %{nb_platform_dir} nbbuild/netbeans/%{nb_platform}
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.24.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
# 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-0.9.23.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.2.0.jar
%{__ln_s} -f %{_javadir}/commons-logging.jar ${IDE_EXT_DIR}/commons-logging-1.0.4.jar
JAVA_EXT_DIR=nbbuild/netbeans/%{nb_java}/modules/ext
%{__mkdir_p} ${JAVA_EXT_DIR}
%{__ln_s} -f %{_javadir}/netbeans-javaparser-api-6.1.jar ${JAVA_EXT_DIR}/javac-api-nb-7.0-b07.jar
%{__ln_s} -f %{_javadir}/netbeans-javaparser-impl-6.1.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.1.jar
%{__ln_s} -f %{_javadir}/junit.jar ${JAVA_EXT_DIR}/junit-3.8.2.jar
%{ant_nb_opt} \
-Do.n.core.dir=%{nb_platform_dir} \
-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
# Build desktop file
%{__cp} -p %{nb_desktop_template} %{nb_desktop}
sed --in-place "s|<nb_ver>|%{nb_ver}|g" %{nb_desktop}
sed --in-place "s|<nb_icon>|%{nb_icon}|g" %{nb_desktop}
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.24.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}/freemarker-2.3.8.jar
%{__rm} -f ${IDE_EXT_DIR}/svnClientAdapter-0.9.23.jar
%{__rm} -f ${IDE_EXT_DIR}/xerces-2.8.0.jar
%{__rm} -f ${IDE_EXT_DIR}/lucene-core-2.2.0.jar
%{__rm} -f ${IDE_EXT_DIR}/commons-logging-1.0.4.jar
# clean up links to ext jars for the java module
%{__rm} -f ${JAVA_EXT_DIR}/javac-api-nb-7.0-b07.jar
%{__rm} -f ${JAVA_EXT_DIR}/javac-impl-nb-7.0-b07.jar
%{__rm} -f ${JAVA_EXT_DIR}/appframework-1.0.3.jar
%{__rm} -f ${JAVA_EXT_DIR}/beansbinding-1.2.1.jar
%{__rm} -f ${JAVA_EXT_DIR}/junit-4.1.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.
# $1 the destination directory.
# $2 the source(s), e.g. nbbuild/netbeans/platform8/* .
install_package() {
DISTDIR=$1
shift
SOURCES=$*
%{__mkdir_p} ${DISTDIR}
%{__cp} -pr ${SOURCES} ${DISTDIR}
}
%{__rm} -rf %{buildroot}
# Install apisupport
install_package %{buildroot}%{nb_apisupport_dir} nbbuild/netbeans/%{nb_apisupport}/*
# Install ide
install_package %{buildroot}%{nb_ide_dir} nbbuild/netbeans/%{nb_ide}/*
# 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.24.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
# 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-0.9.23.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.2.0.jar
%{__ln_s} -f %{_javadir}/commons-logging.jar ${IDE_EXT_DIR}/commons-logging-1.0.4.jar
# Install java
install_package %{buildroot}%{nb_java_dir} nbbuild/netbeans/%{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
# linking the java to the external JARs
JAVA_EXT_DIR=%{buildroot}%{nb_java_dir}/modules/ext
%{__ln_s} -f %{_javadir}/netbeans-javaparser-api-6.1.jar ${JAVA_EXT_DIR}/javac-api-nb-7.0-b07.jar
%{__ln_s} -f %{_javadir}/netbeans-javaparser-impl-6.1.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.1.jar
%{__ln_s} -f %{_javadir}/junit.jar ${JAVA_EXT_DIR}/junit-3.8.2.jar
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
%{__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
%{__ln_s} -f %{ant_lib_dir2}/ant-nodeps.jar ${JAVA_ANT_DIR}/lib/ant-nodeps.jar
%{__ln_s} -f %{ant_lib_dir2}/ant-trax.jar ${JAVA_ANT_DIR}/lib/ant-trax.jar
# Install nb
install_package %{buildroot}%{nb_nb_dir} nbbuild/netbeans/%{nb_nb}/*
# install nb bin (launcher)
install_package %{buildroot}%{nb_bin_dir} nbbuild/netbeans/bin/*
# install nb etc (netbeans.conf, netbeans.clusters)
install_package %{buildroot}%{nb_etc_dir} nbbuild/netbeans/etc/*
# install nb htmls
%{__cp} -p nbbuild/netbeans/CREDITS.html %{buildroot}%{nb_dir}/
%{__cp} -p nbbuild/netbeans/README.html %{buildroot}%{nb_dir}/
%{__cp} -p nbbuild/netbeans/netbeans.css %{buildroot}%{nb_dir}/
# inistall nb config
%{__mkdir_p} %{buildroot}%{nb_config_dir}
echo -n "%{nb_distro_id}" > %{buildroot}%{nb_config_dir}/productid
# Links to nbX.X components
%{__ln_s} ../%{nb_harness} %{buildroot}%{nb_dir}/%{nb_harness}
%{__ln_s} ../%{nb_apisupport} %{buildroot}%{nb_dir}/%{nb_apisupport}
%{__ln_s} ../%{nb_ide} %{buildroot}%{nb_dir}/%{nb_ide}
%{__ln_s} ../%{nb_java} %{buildroot}%{nb_dir}/%{nb_java}
%{__ln_s} ../%{nb_platform} %{buildroot}%{nb_dir}/%{nb_platform}
# Install desktop file
desktop-file-validate %{nb_desktop}
install -d -m 755 %{buildroot}%{_datadir}/applications/%{nb_org}
desktop-file-install --vendor="" \
--dir=%{buildroot}%{_datadir}/applications/%{nb_org} \
%{nb_desktop}
%clean
%{__rm} -rf %{buildroot}
%post
%{__alternatives} --install %{_bindir}/%{nb_} %{nb_} %{nb_launcher} %{nb_alt_priority}
%noautoupdate %{nb_nb_dir}
%preun
if [ "$1" = "0" ]; then
%{__alternatives} --remove %{nb_} %{nb_launcher}
fi
%rm_noautoupdate %{nb_nb_dir}
%post %{nb_apisupport}
%noautoupdate %{nb_apisupport_dir}
%preun %{nb_apisupport}
%rm_noautoupdate %{nb_apisupport_dir}
%post %{nb_ide}
%noautoupdate %{nb_ide_dir}
%preun %{nb_ide}
%rm_noautoupdate %{nb_ide_dir}
%post %{nb_java}
%noautoupdate %{nb_java_dir}
%preun %{nb_java}
%rm_noautoupdate %{nb_java_dir}
%files
%defattr(-,root,root,-)
%dir %{nb_dir}/
%{nb_dir}/
%docdir %{nb_nb_dir}/docs
%dir %{nb_bin_dir}/
%attr(755,root,root) %{nb_launcher}
%{nb_etc_dir}/
%doc %{nb_dir}/CREDITS.html
%doc %{nb_dir}/README.html
%{nb_dir}/netbeans.css
%dir %{_datadir}/applications/%{nb_org}/
%{_datadir}/applications/%{nb_org}/%{nb_desktop}
%files %{nb_apisupport}
%defattr(-,root,root,-)
%{nb_apisupport_dir}/
%doc nbbuild/standard-nbm-license.txt
%files %{nb_ide}
%defattr(-,root,root,-)
%{nb_ide_dir}/
%doc nbbuild/standard-nbm-license.txt
%files %{nb_java}
%defattr(-,root,root,-)
%{nb_java_dir}/
%doc nbbuild/standard-nbm-license.txt
%changelog
* 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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 9 Sep 2008 23:45:58 -0000 1.1
+++ .cvsignore 10 Sep 2008 00:38:06 -0000 1.2
@@ -0,0 +1,2 @@
+netbeans-6.1-200805300101-basic_cluster-src.zip
+netbeans-ide-launcher.zip
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 9 Sep 2008 23:45:59 -0000 1.1
+++ sources 10 Sep 2008 00:38:06 -0000 1.2
@@ -0,0 +1,2 @@
+a7ea855f475fa3a982f094a45c155ab4 netbeans-6.1-200805300101-basic_cluster-src.zip
+71d0c9c582c4ae420ba1f2358da6df06 netbeans-ide-launcher.zip
More information about the fedora-extras-commits
mailing list