rpms/netbeans-platform/devel netbeans-platform-6.7.1-build_bootstrap.patch, NONE, 1.1 netbeans-platform-6.7.1-javac.patch, NONE, 1.1 netbeans-platform-6.7.1-properties.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 netbeans-platform.spec, 1.4, 1.5 sources, 1.2, 1.3 netbeans-platform-6.5-build_bootstrap.patch, 1.1, NONE netbeans-platform-6.5-properties.patch, 1.1, NONE netbeans-platform-6.5-win_launcher.patch, 1.1, NONE

Victor G. Vasilyev victorv at fedoraproject.org
Thu Aug 13 02:29:07 UTC 2009


Author: victorv

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

Modified Files:
	.cvsignore import.log netbeans-platform.spec sources 
Added Files:
	netbeans-platform-6.7.1-build_bootstrap.patch 
	netbeans-platform-6.7.1-javac.patch 
	netbeans-platform-6.7.1-properties.patch 
Removed Files:
	netbeans-platform-6.5-build_bootstrap.patch 
	netbeans-platform-6.5-properties.patch 
	netbeans-platform-6.5-win_launcher.patch 
Log Message:
Re-base for the NetBeans 6.7.1


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

--- NEW FILE netbeans-platform-6.7.1-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.7.1-javac.patch:
 project.properties |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netbeans-platform-6.7.1-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.7.1-properties.patch:
 project.properties |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE netbeans-platform-6.7.1-properties.patch ---
--- netbeans-platform-6.7/o.jdesktop.layout/nbproject/project.properties	2009-07-08 19:15:21.000000000 +0400
+++ netbeans-platform-6.7.new/o.jdesktop.layout/nbproject/project.properties	2009-07-08 19:29:40.000000000 +0400
@@ -39,7 +39,7 @@
 
 is.autoload=true
 release.external/swing-layout-1.0.3.jar=modules/ext/swing-layout-1.0.3.jar
-release.external/swing-layout-1.0.3-doc.zip=docs/swing-layout-1.0.3-doc.zip
-release.external/swing-layout-1.0.3-src.zip=docs/swing-layout-1.0.3-src.zip
+#release.external/swing-layout-1.0.3-doc.zip=docs/swing-layout-1.0.3-doc.zip
+#release.external/swing-layout-1.0.3-src.zip=docs/swing-layout-1.0.3-src.zip
 jnlp.indirect.jars=docs/swing-layout-1.0.3-doc.zip, docs/swing-layout-1.0.3-src.zip
 spec.version.base=1.7.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-platform/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Jan 2009 13:14:33 -0000	1.2
+++ .cvsignore	13 Aug 2009 02:29:07 -0000	1.3
@@ -1 +1 @@
-netbeans-6.5-200811100001-ml-platform-src.zip
+netbeans-6.7.1-200907230233-platform-src.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-platform/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Jan 2009 13:14:33 -0000	1.1
+++ import.log	13 Aug 2009 02:29:07 -0000	1.2
@@ -1 +1,2 @@
 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


Index: netbeans-platform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-platform/devel/netbeans-platform.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- netbeans-platform.spec	25 Jul 2009 18:02:08 -0000	1.4
+++ netbeans-platform.spec	13 Aug 2009 02:29:07 -0000	1.5
@@ -2,12 +2,12 @@
 %define __jar_repack %{nil}
 
 %define nb_             netbeans
-%define nb_ver          6.5
-%define nb_release_time 200811100001
+%define nb_ver          6.7.1
+%define nb_release_time 200907230233
 %define nb_home         %{_datadir}/%{nb_}
 %define nb_dir          %{nb_home}/%{nb_ver}
 
-%define nb_platform_ver 9
+%define nb_platform_ver 10
 %define nb_platform     platform%{nb_platform_ver}
 %define nb_platform_dir %{nb_home}/%{nb_platform}
 
@@ -24,24 +24,36 @@
 
 %define nb_javadoc_site http://bits.netbeans.org/%{nb_ver}/javadoc
 
+%define nbbuild_platform_dir nbbuild/netbeans/%{nb_platform}
+%define nbbuild_harness_dir nbbuild/netbeans/%{nb_harness}
+
 # Prevents use of autoupdate on the specified directory.
 # %1 the directory being prevented for autoupdate.
 %define noautoupdate()    echo > %1/.noautoupdate
 
+# Links the system JAR
+# %1 - the sys jar name
+# %2 - the symlink
+%define lnSysJAR() %{__ln_s} -f %{_javadir}/%{1} %{2} ;
+
 Name:         netbeans-platform
 Version:      %{nb_ver}
-Release:      7%{?dist}
+Release:      1%{?dist}
 Summary:      NetBeans Platform %{nb_platform_ver}
 Group:        Development/Libraries
 License:      GPLv2 with exceptions or CDDL
 URL:          http://platform.netbeans.org
 
-Source0: http://download.netbeans.org/%{nb_}/%{version}/final/zip/%{nb_}-%{version}-%{nb_release_time}-ml-platform-src.zip
+Source0: http://download.netbeans.org/%{nb_}/%{version}/final/zip/%{nb_}-%{version}-%{nb_release_time}-platform-src.zip
 
+# Removes the copy actions for the windows launcher components
+# (*.exe *.dll) from the o.n.bootstrup/build.xml
 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
-# http://www.netbeans.org/issues/show_bug.cgi?id=134544
-Patch2: %{name}-%{version}-win_launcher.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
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -53,18 +65,21 @@ BuildRequires: ant-junit >= 1.7.0
 BuildRequires: ant-nodeps >= 1.7.0
 BuildRequires: ant-trax >= 1.7.0
 BuildRequires: junit4 >= 4.5
-BuildRequires: swing-layout >= 0:1.0
+BuildRequires: swing-layout >= 1.0
 BuildRequires: javahelp2 >= 2.0.05
-BuildRequires: jna >= 3.0.2
+BuildRequires: jna >= 3.0.9
+BuildRequires: cobertura >= 1.9
+BuildRequires: asm2 >= 2.2.1
+BuildRequires: log4j >= 1.2.9
+BuildRequires: jakarta-oro >= 2.0.8
+BuildRequires: jemmy >= 2.3.0.0
 
 Requires: jpackage-utils
 Requires: java >= 1:1.6.0
 Requires: swing-layout >= 1.0
 Requires: javahelp2 >= 2.0.05
-Requires: jna >= 3.0.2
-
+Requires: jna >= 3.0.9
 Obsoletes: netbeans-platform8 < 6.5
-Provides:  netbeans-platform8 < 6.5
 
 %description
 The NetBeans Platform is a generic framework for Swing applications. 
@@ -90,13 +105,18 @@ Requires: java >= 1:1.6.0
 Requires: ant >= 1.7.0
 Requires: %{name} = %{version}-%{release}
 Requires: javahelp2 >= 2.0.05
+Requires: cobertura >= 1.9
+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
 
 %prep
-%setup -q -c 
+%setup -q -c
 
 find . -type f \( -iname "*.jar" -o -iname "*.zip" \) | xargs -t %{__rm} -f
 find . -type f \( -iname "*.exe" \) | xargs -t %{__rm} -f
@@ -109,12 +129,18 @@ echo "package javax.script; class empty 
 %{__mkdir_p} libs.jsr223/external
 jar cf libs.jsr223/external/jsr223-api.jar libs.jsr223/src/javax/script/empty.java
 
-# to build the netbeans modules the installed jars will be used instead of pre-packaged ones
-%{__ln_s} -f %{_javadir}/swing-layout.jar o.jdesktop.layout/external/swing-layout-1.0.3.jar
-%{__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}/jna.jar libs.jna/external/jna-3.0.2.jar
-%{__ln_s} -f %{_javadir}/junit4.jar libs.junit4/external/junit-4.5.jar
+# To build the netbeans modules the installed jars will be used instead of pre-packaged ones
+%lnSysJAR javahelp2.jar     javahelp/external/jh-2.0_05.jar
+%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 javahelp2.jar apisupport.harness/external/jsearch-2.0_05.jar
+%lnSysJAR cobertura.jar apisupport.harness/external/cobertura-1.9.jar
+%lnSysJAR asm2-all.jar  apisupport.harness/external/asm-2.2.1.jar
+%lnSysJAR asm2-all.jar  apisupport.harness/external/asm-tree-2.2.1.jar
+%lnSysJAR log4j.jar     apisupport.harness/external/log4j-1.2.9.jar
+%lnSysJAR oro.jar       apisupport.harness/external/jakarta-oro-2.0.8.jar
 
 %patch0 -p1
 %patch1 -p1
@@ -122,17 +148,8 @@ jar cf libs.jsr223/external/jsr223-api.j
 
 %build
 
-# build platform
+# build platform & harness
 %{ant_nb_opt} -f nbbuild/build.xml build-platform
-%{__ln_s} -f %{_javadir}/swing-layout.jar nbbuild/netbeans/%{nb_platform}/modules/ext/swing-layout-1.0.3.jar
-%{__ln_s} -f %{_javadir}/javahelp2.jar nbbuild/netbeans/%{nb_platform}/modules/ext/jsearch-2.0_05.jar
-%{__ln_s} -f %{_javadir}/javahelp2.jar nbbuild/netbeans/%{nb_platform}/modules/ext/jh-2.0_05.jar
-%{__ln_s} -f %{_javadir}/jna.jar nbbuild/netbeans/%{nb_platform}/modules/ext/jna-3.0.2.jar
-%{__ln_s} -f %{_javadir}/junit4.jar nbbuild/netbeans/%{nb_platform}/modules/ext/junit-4.5.jar
-
-# build platform harness
-%{ant_nb_opt} -f apisupport.harness/build.xml
-%{__ln_s} -f %{_javadir}/javahelp2.jar nbbuild/netbeans/%{nb_harness}/jsearch-2.0_05.jar
 
 # build platform javadoc
 %{ant_nb_opt} \
@@ -149,18 +166,9 @@ sendopts,options.api,editor.mimelookup \
    -Djavadoc.docs.org-netbeans-modules-project-ant=%{nb_javadoc_site}/org-netbeans-modules-project-ant/ \
    -Djavadoc.docs.org-netbeans-modules-projectapi=%{nb_javadoc_site}/org-netbeans-modules-projectapi/ \
    -f nbbuild/build.xml build-javadoc
-%{__rm} -rf nbbuild/build/javadoc/*.zip
-
-# clean up links to ext jars
-%{__rm} -f nbbuild/netbeans/%{nb_platform}/modules/ext/swing-layout-1.0.3.jar
-%{__rm} -f nbbuild/netbeans/%{nb_platform}/modules/ext/jsearch-2.0_05.jar
-%{__rm} -f nbbuild/netbeans/%{nb_platform}/modules/ext/jh-2.0_05.jar
-%{__rm} -f nbbuild/netbeans/%{nb_platform}/modules/ext/jna-3.0.2.jar
-%{__rm} -f nbbuild/netbeans/%{nb_platform}/modules/ext/junit-4.5.jar
-%{__rm} -f nbbuild/netbeans/%{nb_harness}/jsearch-2.0_05.jar
 
 # clean up stub jars
-%{__rm} -f nbbuild/netbeans/%{nb_platform}/modules/ext/script-api.jar
+%{__rm} -f %{nbbuild_platform_dir}/modules/ext/script-api.jar
 
 %install
 
@@ -172,11 +180,11 @@ sendopts,options.api,editor.mimelookup \
 %noautoupdate %{buildroot}%{nb_platform_dir}
 
 # linking the platform to the external JARs
-%{__ln_s} -f %{_javadir}/swing-layout.jar %{buildroot}%{nb_platform_dir}/modules/ext/swing-layout-1.0.3.jar
-%{__ln_s} -f %{_javadir}/javahelp2.jar %{buildroot}%{nb_platform_dir}/modules/ext/jsearch-2.0_05.jar
-%{__ln_s} -f %{_javadir}/javahelp2.jar %{buildroot}%{nb_platform_dir}/modules/ext/jh-2.0_05.jar
-%{__ln_s} -f %{_javadir}/jna.jar %{buildroot}%{nb_platform_dir}/modules/ext/jna-3.0.2.jar
-%{__ln_s} -f %{_javadir}/junit4.jar %{buildroot}%{nb_platform_dir}/modules/ext/junit-4.5.jar
+BR_PLATFORM_EXT=%{buildroot}%{nb_platform_dir}/modules/ext
+%lnSysJAR javahelp2.jar    ${BR_PLATFORM_EXT}/jh-2.0_05.jar
+%lnSysJAR jna.jar          ${BR_PLATFORM_EXT}/jna-3.0.9.jar
+%lnSysJAR junit4.jar       ${BR_PLATFORM_EXT}/junit-4.5.jar
+%lnSysJAR swing-layout.jar ${BR_PLATFORM_EXT}/swing-layout-1.0.3.jar
 
 # install harness
 %{__mkdir_p} %{buildroot}%{nb_harness_dir}
@@ -184,7 +192,14 @@ sendopts,options.api,editor.mimelookup \
 %noautoupdate %{buildroot}%{nb_harness_dir}
 
 # linking the harness to the external JARs
-%{__ln_s} -f %{_javadir}/javahelp2.jar %{buildroot}%{nb_harness_dir}/jsearch-2.0_05.jar
+BR_HARNESS=%{buildroot}%{nb_harness_dir}
+%lnSysJAR javahelp2.jar ${BR_HARNESS}/antlib/jsearch-2.0_05.jar
+%lnSysJAR jemmy.jar ${BR_HARNESS}/modules/ext/jemmy-2.3.0.0.jar
+%lnSysJAR cobertura.jar ${BR_HARNESS}/testcoverage/cobertura/cobertura-1.9.jar
+%lnSysJAR asm2-all.jar  ${BR_HARNESS}/testcoverage/cobertura/lib/asm-2.2.1.jar
+%lnSysJAR asm2-all.jar  ${BR_HARNESS}/testcoverage/cobertura/lib/asm-tree-2.2.1.jar
+%lnSysJAR oro.jar       ${BR_HARNESS}/testcoverage/cobertura/lib/jakarta-oro-2.0.8.jar
+%lnSysJAR log4j.jar     ${BR_HARNESS}/testcoverage/cobertura/lib/log4j-1.2.9.jar
 
 # install javadoc
 %{__mkdir_p} %{buildroot}%{nb_javadoc_dir}
@@ -195,8 +210,7 @@ sendopts,options.api,editor.mimelookup \
 
 %files
 %defattr(-,root,root,-)
-%doc nbbuild/licenses/CDDL-1.0 nbbuild/licenses/CDDL-GPL-2-CP 
-%doc nbbuild/licenses/GPL-2-CP nbbuild/licenses/GPL-with-Proguard-exception
+%doc nbbuild/licenses/CDDL-GPL-2-CP
 %dir %{nb_home}/
 %dir %{nb_platform_dir}/
 %{nb_platform_dir}/config
@@ -213,58 +227,38 @@ sendopts,options.api,editor.mimelookup \
 %files %{nb_harness}
 %defattr(-,root,root,-)
 %dir %{nb_harness_dir}/
+%{nb_harness_dir}/antlib
 %{nb_harness_dir}/config
 %{nb_harness_dir}/etc
 %{nb_harness_dir}/jnlp
 %dir %{nb_harness_dir}/launchers
 %attr(755, root, root) %{nb_harness_dir}/launchers/app.sh
 %{nb_harness_dir}/modules
+%{nb_harness_dir}/testcoverage
 %{nb_harness_dir}/update_tracking
 %doc %{nb_harness_dir}/README
 %{nb_harness_dir}/build.xml
 %{nb_harness_dir}/common.xml
 %{nb_harness_dir}/jdk.xml
 %{nb_harness_dir}/jnlp.xml
-%{nb_harness_dir}/jsearch-2.0_05.jar
 %{nb_harness_dir}/run.xml
 %{nb_harness_dir}/suite.xml
-%{nb_harness_dir}/suite.xml.orig
 %{nb_harness_dir}/tasks.jar
 %{nb_harness_dir}/.noautoupdate
+%{nb_harness_dir}/no-testcoverage.xml
+%{nb_harness_dir}/testcoverage-suite.xml
+%{nb_harness_dir}/testcoverage.xml
 
 %files %{nb_javadoc}
 %defattr(-,root,root,-)
 %doc %{nb_javadoc_dir}/
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.5-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.5-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Feb 04 2009 Victor Vasilyev <victor.vasilyev at sun.com> 6.5-5
-- Bug #483384 - "netbeans : Unowned directories" is fixed
-- netbeans-platform provides netbeans-platform8
-
-* Mon Jan 12 2009 Victor Vasilyev <victor.vasilyev at sun.com> 6.5-4
-- Creation of the .noautoupdate files is  moved to the install section
-
-* Tue Dec 30 2008 Victor Vasilyev <victor.vasilyev at sun.com> 6.5-3
-- The "Distrubution" tag is deleted
-- The "6.1" references are removed from the changelog
-- Specifications of providing non-Fedora packages are removed
-
-* Tue Dec 19 2008 Victor Vasilyev <victor.vasilyev at sun.com> 6.5-2
-- The platform version number is removed from the package names
-- "Obsoletes" are added for the netbeans-platform8* packages
-
-* Tue Dec 02 2008 Victor Vasilyev <victor.vasilyev at sun.com> 6.5-1
-- Bootstrapping of the spec 6.1 for platform of the NetBeans 6.5
-- Patch for the fixed issue http://www.netbeans.org/issues/show_bug.cgi?id=143729 is deleted
-- The binaries-list files are removed from the sources
-- BR junit -> junit4
-- An original of suite.xml is saved as suite.xml.orig in the harness
-- Call of the brp-java-repack-jars script is disabled
-- Description for the platform is changed
-- A previous version of harness is marked as obsolete
+* 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-platform/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Jan 2009 13:14:33 -0000	1.2
+++ sources	13 Aug 2009 02:29:07 -0000	1.3
@@ -1 +1 @@
-2925d770380fbd028230788120816281  netbeans-6.5-200811100001-ml-platform-src.zip
+da30b40c20dc3b6a391bad4a7cdb6766  netbeans-6.7.1-200907230233-platform-src.zip


--- netbeans-platform-6.5-build_bootstrap.patch DELETED ---


--- netbeans-platform-6.5-properties.patch DELETED ---


--- netbeans-platform-6.5-win_launcher.patch DELETED ---




More information about the fedora-extras-commits mailing list