rpms/netbeans/devel netbeans-6.1-60-small-ide-config.patch, 1.1, 1.2 netbeans.spec, 1.1, 1.2
Victor G. Vasilyev
victorv at fedoraproject.org
Fri Sep 19 15:17:30 UTC 2008
Author: victorv
Update of /cvs/pkgs/rpms/netbeans/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32576/devel
Modified Files:
netbeans-6.1-60-small-ide-config.patch netbeans.spec
Log Message:
Release 5
netbeans-6.1-60-small-ide-config.patch:
Index: netbeans-6.1-60-small-ide-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/netbeans-6.1-60-small-ide-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netbeans-6.1-60-small-ide-config.patch 10 Sep 2008 00:38:06 -0000 1.1
+++ netbeans-6.1-60-small-ide-config.patch 19 Sep 2008 15:17:30 -0000 1.2
@@ -1,6 +1,6 @@
-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
+diff -Nur 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-24 16:16:34.000000000 +0400
++++ netbeans-6.1.new/form.kit/nbproject/project.xml 2008-09-18 20:15:46.000000000 +0400
@@ -12,13 +12,13 @@
<specification-version>1.22</specification-version>
</run-dependency>
@@ -17,7 +17,7 @@
<dependency>
<code-name-base>org.netbeans.modules.i18n.form</code-name-base>
<run-dependency>
-@@ -26,12 +26,12 @@
+@@ -26,24 +26,24 @@
<specification-version>1.21</specification-version>
</run-dependency>
</dependency>
@@ -32,9 +32,23 @@
<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
+ <specification-version>1.0</specification-version>
+ </run-dependency>
+ </dependency>
+- <dependency>
++ <!--dependency>
+ <code-name-base>org.netbeans.modules.swingapp</code-name-base>
+ <run-dependency>
+ <specification-version>1.1</specification-version>
+ </run-dependency>
+- </dependency>
++ </dependency-->
+ </module-dependencies>
+ <public-packages/>
+ </data>
+diff -Nur 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-24 16:16:03.000000000 +0400
++++ netbeans-6.1.new/ide.kit/nbproject/project.xml 2008-09-18 20:14:41.000000000 +0400
@@ -130,13 +130,13 @@
<specification-version>1.11</specification-version>
</run-dependency>
@@ -51,9 +65,9 @@
<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
+diff -Nur 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-24 16:16:47.000000000 +0400
++++ netbeans-6.1.new/java.kit/nbproject/project.xml 2008-09-18 20:14:41.000000000 +0400
@@ -66,13 +66,13 @@
<specification-version>1.6</specification-version>
</run-dependency>
@@ -88,9 +102,9 @@
</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
+diff -Nur netbeans-6.1/nbbuild/cluster.properties netbeans-6.1.new/nbbuild/cluster.properties
+--- netbeans-6.1/nbbuild/cluster.properties 2008-06-24 16:17:06.000000000 +0400
++++ netbeans-6.1.new/nbbuild/cluster.properties 2008-09-18 20:55:18.000000000 +0400
@@ -231,14 +231,6 @@
api.xml,\
classfile,\
@@ -140,13 +154,11 @@
nb.cluster.java.dir=java2
nb.cluster.java.depends=\
-@@ -349,27 +337,19 @@
- ant.kit,\
+@@ -350,26 +338,18 @@
api.debugger.jpda,\
api.java,\
-- beans,\
+ beans,\
- dbschema,\
-+ beans,\
debugger.jpda,\
debugger.jpda.ant,\
debugger.jpda.projects,\
@@ -169,7 +181,7 @@
java.api.common,\
java.debug,\
java.editor,\
-@@ -395,16 +375,10 @@
+@@ -395,16 +375,9 @@
junit,\
libs.javacapi,\
libs.javacimpl,\
@@ -178,7 +190,7 @@
o.jdesktop.beansbinding,\
refactoring.java,\
- spring.beans,\
- swingapp,\
+- swingapp,\
- websvc.jaxws21,\
- websvc.jaxws21api,\
- websvc.serviceapi,\
Index: netbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/netbeans.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netbeans.spec 10 Sep 2008 00:38:06 -0000 1.1
+++ netbeans.spec 19 Sep 2008 15:17:30 -0000 1.2
@@ -36,7 +36,7 @@
%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
+%define nb_nb_config_dir %{nb_nb_dir}/config
# See http://wiki.netbeans.org/NBDistroIDs
%define nb_distro_id NBFC
@@ -81,7 +81,7 @@
Name: %{nb_}
Version: %{nb_ver}
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Integrated Development Environment (IDE)
Group: Development/Tools
License: GPLv2 with exceptions or CDDL
@@ -213,8 +213,8 @@
%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 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.
@@ -382,9 +382,9 @@
%{__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
+
+# inistall nb/nbX.X config
+echo -n "%{nb_distro_id}" > %{buildroot}%{nb_nb_config_dir}/productid
# Links to nbX.X components
%{__ln_s} ../%{nb_harness} %{buildroot}%{nb_dir}/%{nb_harness}
@@ -461,6 +461,10 @@
%doc nbbuild/standard-nbm-license.txt
%changelog
+* 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
More information about the fedora-extras-commits
mailing list