Tue Jan 26 16:58:17 UTC 2010

Author: victorv

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

Modified Files:
	.cvsignore import.log netbeans-platform.spec sources 
Added Files:
	netbeans-platform-6.8~build_bootstrap.patch 
	netbeans-platform-6.8~javac.patch 
	netbeans-platform-6.8~launcher.patch 
	netbeans-platform-6.8~properties.patch 
Removed Files:
	netbeans-platform-6.7.1-build_bootstrap.patch 
	netbeans-platform-6.7.1-javac.patch 
	netbeans-platform-6.7.1-launcher.patch 
	netbeans-platform-6.7.1-properties.patch 
Log Message:
Bug 541638 - RFE: Upgrade the NetBeans to version 6.8

netbeans-platform-6.8~build_bootstrap.patch:
 build.xml |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE netbeans-platform-6.8~build_bootstrap.patch ---
diff -Nur netbeans-platform-6.7/o.n.bootstrap/build.xml netbeans-platform-6.7.new/o.n.bootstrap/build.xml
--- netbeans-platform-6.7/o.n.bootstrap/build.xml	2009-05-21 02:24:48.000000000 +0400
+++ netbeans-platform-6.7.new/o.n.bootstrap/build.xml	2009-05-21 02:51:50.000000000 +0400
@@ -65,8 +65,10 @@
     <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-platform-6.8~javac.patch:
 project.properties |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netbeans-platform-6.8~javac.patch ---
diff -Nur -x '*.orig' -x '*~' libnb-platform-java-6.7.1/apisupport.harness/nbproject/project.properties libnb-platform-java-6.7.1.new/apisupport.harness/nbproject/project.properties
--- libnb-platform-java-6.7.1/apisupport.harness/nbproject/project.properties	2009-07-21 23:25:00.000000000 +0400
+++ libnb-platform-java-6.7.1.new/apisupport.harness/nbproject/project.properties	2009-07-23 20:27:05.000000000 +0400
@@ -48,7 +48,7 @@
 release.../nbbuild/templates/no-testcoverage.xml=no-testcoverage.xml
 release.../nbbuild/jdk.xml=jdk.xml
 release.external/jsearch-2.0_05.jar=antlib/jsearch-2.0_05.jar
-release.external/openjdk-javac-6-b12.jar=antlib/openjdk-javac-6-b12.jar
+#release.external/openjdk-javac-6-b12.jar=antlib/openjdk-javac-6-b12.jar
 extra.module.files=\
     jnlp/jnlp-launcher.jar,\
     tasks.jar

netbeans-platform-6.8~launcher.patch:
 nbexec |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netbeans-platform-6.8~launcher.patch ---
diff -Nur netbeans-platform-6.8/o.n.bootstrap/launcher/unix/nbexec netbeans-platform-6.8.new/o.n.bootstrap/launcher/unix/nbexec
--- netbeans-platform-6.8/o.n.bootstrap/launcher/unix/nbexec	2009-11-24 23:08:51.000000000 +0300
+++ netbeans-platform-6.8.new/o.n.bootstrap/launcher/unix/nbexec	2009-11-24 23:21:12.467694914 +0300
@@ -189,7 +189,7 @@
 fi
 
 # if heap dump on OOME is supported enable it
-if "${jdkhome}/bin/java" -XX:+HeapDumpOnOutOfMemoryError > /dev/null 2>&1 ; then
+if "${jdkhome}/bin/java" -XX:+HeapDumpOnOutOfMemoryError &> /dev/null 2>&1 ; then
    jargs="$jargs -XX:+HeapDumpOnOutOfMemoryError"
    if echo $jargs | grep -v -- "-XX:HeapDumpPath=" > /dev/null ; then
       jargs="$jargs -XX:HeapDumpPath=\"${userdir}/var/log/heapdump.hprof\""

netbeans-platform-6.8~properties.patch:
 project.properties |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE netbeans-platform-6.8~properties.patch ---
diff -Nur netbeans-platform-6.8/o.jdesktop.layout/nbproject/project.properties netbeans-platform-6.8.new/o.jdesktop.layout/nbproject/project.properties
--- netbeans-platform-6.8/o.jdesktop.layout/nbproject/project.properties	2009-11-24 22:52:41.000000000 +0300
+++ netbeans-platform-6.8.new/o.jdesktop.layout/nbproject/project.properties	2009-11-24 23:05:51.282154361 +0300
@@ -39,7 +39,7 @@
 
 is.autoload=true
 release.external/swing-layout-1.0.4.jar=modules/ext/swing-layout-1.0.4.jar
-release.external/swing-layout-1.0.4-doc.zip=docs/swing-layout-1.0.4-doc.zip
-release.external/swing-layout-1.0.4-src.zip=docs/swing-layout-1.0.4-src.zip
+#release.external/swing-layout-1.0.4-doc.zip=docs/swing-layout-1.0.4-doc.zip
+#release.external/swing-layout-1.0.4-src.zip=docs/swing-layout-1.0.4-src.zip
 jnlp.indirect.jars=docs/swing-layout-1.0.4-doc.zip, docs/swing-layout-1.0.4-src.zip
 spec.version.base=1.10.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-platform/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	13 Aug 2009 02:29:07 -0000	1.3
+++ .cvsignore	26 Jan 2010 16:58:16 -0000	1.4
@@ -1 +1 @@
-netbeans-6.7.1-200907230233-platform-src.zip
+netbeans-6.8-200912041610-platform-src.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-platform/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	9 Sep 2009 20:22:35 -0000	1.3
+++ import.log	26 Jan 2010 16:58:17 -0000	1.4
@@ -1,3 +1,4 @@
 netbeans-platform-6_5-4_fc11:HEAD:netbeans-platform-6.5-4.fc11.src.rpm:1231938808
 netbeans-platform-6_7_1-1_fc12:HEAD:netbeans-platform-6.7.1-1.fc12.src.rpm:1250130860
 netbeans-platform-6_7_1-2_fc12:HEAD:netbeans-platform-6.7.1-2.fc12.src.rpm:1252527869
+netbeans-platform-6_8-1_fc13:HEAD:netbeans-platform-6.8-1.fc13.src.rpm:1264525005


Index: netbeans-platform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-platform/devel/netbeans-platform.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- netbeans-platform.spec	9 Sep 2009 20:22:35 -0000	1.6
+++ netbeans-platform.spec	26 Jan 2010 16:58:17 -0000	1.7
@@ -2,12 +2,13 @@
 %define __jar_repack %{nil}
 
 %define nb_             netbeans
-%define nb_ver          6.7.1
-%define nb_release_time 200907230233
+%define nb_ver          6.8
+
+%define nb_release_time 200912041610
 %define nb_home         %{_datadir}/%{nb_}
 %define nb_dir          %{nb_home}/%{nb_ver}
 
-%define nb_platform_ver 10
+%define nb_platform_ver 11
 %define nb_platform     platform%{nb_platform_ver}
 %define nb_platform_dir %{nb_home}/%{nb_platform}
 
@@ -34,11 +35,11 @@
 # Links the system JAR
 # %1 - the sys jar
 # %2 - the symlink name/path (optional)
-%global lnSysJAR() %__ln_s -f %{_javadir}/%{*} ;
+%global lnSysJAR() if [ -f %{_javadir}/%{1} ] ; then  %__ln_s -f %{_javadir}/%{*} ; else echo "%{1} doesn't exist." ; exit 1 ; fi ;
 
 Name:         netbeans-platform
 Version:      %{nb_ver}
-Release:      2%{?dist}
+Release:      1%{?dist}
 Summary:      NetBeans Platform %{nb_platform_ver}
 Group:        Development/Libraries
 License:      GPLv2 with exceptions or CDDL
@@ -48,14 +49,14 @@ Source0: http://download.netbeans.org/%{
 
 # Removes the copy actions for the windows launcher components
 # (*.exe *.dll) from the o.n.bootstrup/build.xml
-Patch0: %{name}-%{version}-build_bootstrap.patch
+Patch0: %{name}-%{version}~build_bootstrap.patch
 # Prevents from releasing zip files (swing-layout-1.0.3-doc.zip,
 # swing-layout-1.0.3-src.zip) in the o.jdesktop.layout module
-Patch1: %{name}-%{version}-properties.patch
+Patch1: %{name}-%{version}~properties.patch
 # openjdk-javac-6-b12.jar is needed only if JDK 1.5 is used, but we use JDK 1.6
-Patch2: %{name}-%{version}-javac.patch
+Patch2: %{name}-%{version}~javac.patch
 # Avoids spam in the log if the -XX:+HeapDumpOnOutOfMemoryError option is not supported by the JVM
-Patch3: %{name}-%{version}-launcher.patch
+Patch3: %{name}-%{version}~launcher.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -81,7 +82,6 @@ Requires: java >= 1:1.6.0
 Requires: swing-layout >= 1.0
 Requires: javahelp2 >= 2.0.05
 Requires: jna >= 3.0.9
-Obsoletes: netbeans-platform8 < 6.5
 
 %description
 The NetBeans Platform is a generic framework for Swing applications. 
@@ -92,7 +92,6 @@ access, etc.
 %package %{nb_javadoc}
 Summary: Javadoc documentation for NetBeans Platform %{nb_platform_ver}
 Group: Documentation
-Obsoletes: netbeans-platform8-javadoc < 6.5
 %description %{nb_javadoc}
 NetBeans Platform is a set of modules, each providing
 their own APIs and working together or in a standalone
@@ -112,7 +111,6 @@ Requires: asm2 >= 2.2.1
 Requires: log4j >= 1.2.9
 Requires: jakarta-oro >= 2.0.8
 Requires: jemmy >= 2.3.0.0
-Obsoletes: netbeans-platform8-harness < 6.5
 %description %{nb_harness}
 Harness with build scripts and ant tasks for everyone who
 build an application on top of NetBeans Platform
@@ -136,7 +134,7 @@ jar cf libs.jsr223/external/jsr223-api.j
 %lnSysJAR jemmy.jar         jemmy/external/jemmy-2.3.0.0.jar
 %lnSysJAR jna.jar           libs.jna/external/jna-3.0.9.jar
 %lnSysJAR junit4.jar        libs.junit4/external/junit-4.5.jar
-%lnSysJAR swing-layout.jar  o.jdesktop.layout/external/swing-layout-1.0.3.jar
+%lnSysJAR swing-layout.jar  o.jdesktop.layout/external/swing-layout-1.0.4.jar
 pushd apisupport.harness/external
   %lnSysJAR javahelp2.jar jsearch-2.0_05.jar
   %lnSysJAR cobertura.jar cobertura-1.9.jar
@@ -145,6 +143,13 @@ pushd apisupport.harness/external
   %lnSysJAR log4j.jar     log4j-1.2.9.jar
   %lnSysJAR oro.jar       jakarta-oro-2.0.8.jar
 popd
+pushd apisupport.tc.cobertura/external
+  %lnSysJAR asm2-all.jar  asm-2.2.1.jar
+  %lnSysJAR asm2-all.jar  asm-tree-2.2.1.jar
+  %lnSysJAR cobertura.jar cobertura-1.9.jar
+  %lnSysJAR oro.jar       jakarta-oro-2.0.8.jar
+  %lnSysJAR log4j.jar     log4j-1.2.9.jar
+popd
 
 %patch0 -p1
 %patch1 -p1
@@ -188,7 +193,7 @@ pushd %{buildroot}%{nb_platform_dir}/mod
   %lnSysJAR javahelp2.jar    jh-2.0_05.jar
   %lnSysJAR jna.jar          jna-3.0.9.jar
   %lnSysJAR junit4.jar       junit-4.5.jar
-  %lnSysJAR swing-layout.jar swing-layout-1.0.3.jar
+  %lnSysJAR swing-layout.jar swing-layout-1.0.4.jar
 popd
 
 # install harness
@@ -265,14 +270,5 @@ popd
 %doc %{nb_javadoc_dir}/
 
 %changelog
-* Wed Aug 19 2009 Victor Vasilyev <victor.vasilyev at sun.com> 6.7.1-2
-- The Patch3 for the platform launcher
-- Remove javadoc zip archives
-* Thu May 21 2009 Victor Vasilyev <victor.vasilyev at sun.com> 6.7.1-1
-- Bootstrapping of the spec 6.5 for platform of the NetBeans 6.7.1
-- jna-3.0.2.jar -> jna-3.0.9.jar
-- cobertura-1.9.jar
-- asm-2.2.1.jar provided by asm2-2.2.3
-- log4j-1.2.9.jar provided by log4j-1.2.14
-- jakarta-oro-2.0.8.jar
-- jemmy-2.3.0.0.jar
+* Wed Nov 25 2009 Victor Vasilyev <victor.vasilyev at sun.com> 6.8-1
+- Bootstrapping of the spec 6.7.1 for platform of the NetBeans 6.8


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-platform/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	13 Aug 2009 02:29:07 -0000	1.3
+++ sources	26 Jan 2010 16:58:17 -0000	1.4
@@ -1 +1 @@
-da30b40c20dc3b6a391bad4a7cdb6766  netbeans-6.7.1-200907230233-platform-src.zip
+0378ff8794fce393a9cd18eb7abdea67  netbeans-6.8-200912041610-platform-src.zip


--- netbeans-platform-6.7.1-build_bootstrap.patch DELETED ---


--- netbeans-platform-6.7.1-javac.patch DELETED ---


--- netbeans-platform-6.7.1-launcher.patch DELETED ---


--- netbeans-platform-6.7.1-properties.patch DELETED ---

