rpms/netbeans/devel netbeans.spec,1.3,1.4

[Victor G. Vasilyev]

Author: victorv

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

Modified Files:
	netbeans.spec 
Log Message:
Dependency on java-sdk is added. Issues #464558, #465891.



Index: netbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/netbeans.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- netbeans.spec	1 Oct 2008 14:02:22 -0000	1.3
+++ netbeans.spec	7 Oct 2008 13:31:59 -0000	1.4
@@ -81,7 +81,7 @@
 
 Name:           %{nb_}
 Version:        %{nb_ver}
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Integrated Development Environment (IDE)
 Group:          Development/Tools
 License:        GPLv2 with exceptions or CDDL
@@ -196,7 +196,7 @@
 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: java-sdk >= 1:1.6.0
 Requires: netbeans-javaparser = %{version}
 Requires: appframework >= 1.03
 Requires: beansbinding >= 1.2.1
@@ -213,8 +213,6 @@
 %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.
@@ -461,6 +459,9 @@
 %doc nbbuild/standard-nbm-license.txt
 
 %changelog
+* 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.