Author: victorv
Update of /cvs/pkgs/rpms/netbeans/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1513
Modified Files:
netbeans-6.1-50-ide-launcher.patch netbeans.spec
Log Message:
Release 6: Showing an incorrect EULA at startup is disabled (
https://bugzilla.redhat.com/show_bug.cgi?id=464820 ).
netbeans-6.1-50-ide-launcher.patch:
Index: netbeans-6.1-50-ide-launcher.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/netbeans-6.1-50-ide-launcher.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netbeans-6.1-50-ide-launcher.patch 10 Sep 2008 00:38:06 -0000 1.1
+++ netbeans-6.1-50-ide-launcher.patch 1 Oct 2008 14:02:22 -0000 1.2
@@ -1,13 +1,13 @@
-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
+diff -Nur netbeans-ide-launcher/ide/launcher/unix/netbeans
netbeans-ide-launcher.new/ide/launcher/unix/netbeans
+--- netbeans-ide-launcher/ide/launcher/unix/netbeans 2008-06-30 17:47:50.000000000 +0400
++++ netbeans-ide-launcher.new/ide/launcher/unix/netbeans 2008-10-01 03:32:59.000000000
+0400
@@ -54,16 +54,18 @@
fi
done
-progdir=`dirname "$PRG"`
+#progdir=`dirname "$PRG"`
-+# Patch for Debian/Ubuntu where launcher is in /usr/bin
++# Patch for Debian/Ubuntu/Fedora where launcher is in /usr/bin
+progdir=/usr/share/netbeans/6.1/bin
if [ -f "$progdir"/../etc/netbeans.conf ] ; then
@@ -18,9 +18,17 @@
-# if [ -f /etc/netbeans.conf ] ; then
-# . /etc/netbeans.conf
-# fi
-+ 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 "$@"
+@@ -199,7 +201,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} \
+ '"$@"'
+ ;;
Index: netbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/netbeans.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- netbeans.spec 19 Sep 2008 15:17:30 -0000 1.2
+++ netbeans.spec 1 Oct 2008 14:02:22 -0000 1.3
@@ -81,7 +81,7 @@
Name: %{nb_}
Version: %{nb_ver}
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Integrated Development Environment (IDE)
Group: Development/Tools
License: GPLv2 with exceptions or CDDL
@@ -461,6 +461,9 @@
%doc nbbuild/standard-nbm-license.txt
%changelog
+* Wed Oct 01 2008 Victor G. Vasilyev <victor.vasilyev(a)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(a)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)