[netbeans-platform/f16] * Tue Aug 30 2011 Deepak Bhole <dbhole at redhat.com> - 6.9.1-2 - Revert to 6.9, bump epoch
Deepak Bhole
dbhole at fedoraproject.org
Tue Aug 30 19:22:30 UTC 2011
commit 2a1053c37287bda1291259a927cbc55921c89fda
Author: Deepak Bhole <dbhole at redhat.com>
Date: Tue Aug 30 15:15:29 2011 -0400
* Tue Aug 30 2011 Deepak Bhole <dbhole at redhat.com> - 6.9.1-2
- Revert to 6.9, bump epoch
.gitignore | 1 -
build-native-code.patch | 10 -
do-not-name-sos-based-on-arch.patch | 26 ---
fix-native-dir-paths.patch | 50 ------
jnilib-build-uniformly-across-archs.patch | 67 -------
netbeans-platform-6.9~launcher.patch | 12 ++
netbeans-platform-6.9~nbi.patch | 39 ++++
netbeans-platform-6.9~properties.patch | 12 ++
...=> netbeans-platform-6.9~release_external.patch | 0
netbeans-platform.spec | 182 ++++++++++----------
no-windows-cleaners.patch | 14 --
remove-non-linux-jna-bits.patch | 15 --
remove-non-linux-jni-libs.patch | 40 -----
remove-swing-layout-src.patch | 9 -
sources | 2 +-
15 files changed, 152 insertions(+), 327 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a881ced..e41391a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
netbeans-6.9-201006101454-platform-src.zip
/netbeans-6.9.1-201007282301-platform-src.zip
-/netbeans-7.0-201104080000-platform-src.zip
diff --git a/netbeans-platform-6.9~launcher.patch b/netbeans-platform-6.9~launcher.patch
new file mode 100644
index 0000000..67ceee0
--- /dev/null
+++ b/netbeans-platform-6.9~launcher.patch
@@ -0,0 +1,12 @@
+diff -Nur netbeans-platform-6.9/o.n.bootstrap/launcher/unix/nbexec netbeans-platform-6.9.new/o.n.bootstrap/launcher/unix/nbexec
+--- netbeans-platform-6.9/o.n.bootstrap/launcher/unix/nbexec 2010-05-31 20:58:20.000000000 +0400
++++ netbeans-platform-6.9.new/o.n.bootstrap/launcher/unix/nbexec 2010-06-15 21:33:51.451147364 +0400
+@@ -192,7 +192,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\""
diff --git a/netbeans-platform-6.9~nbi.patch b/netbeans-platform-6.9~nbi.patch
new file mode 100644
index 0000000..258895c
--- /dev/null
+++ b/netbeans-platform-6.9~nbi.patch
@@ -0,0 +1,39 @@
+diff -Nur netbeans-platform-6.9/nbi/engine/build.xml netbeans-platform-6.9.new/nbi/engine/build.xml
+--- netbeans-platform-6.9/nbi/engine/build.xml 2010-05-31 20:58:10.000000000 +0400
++++ netbeans-platform-6.9.new/nbi/engine/build.xml 2010-06-11 00:19:36.246133118 +0400
+@@ -117,12 +117,14 @@
+ <mkdir dir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.solaris-x86}"/>
+ <mkdir dir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.macosx}"/>
+
++<!--
+ <copy file="${native.dirname}/${native.jnilib.dir.windows}/${native.dist.dir}/${native.jnilib.file.windows.i386}"
+ todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.windows}"/>
+ <copy file="${native.dirname}/${native.jnilib.dir.windows}/${native.dist.dir}/${native.jnilib.file.windows.amd64}"
+ todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.windows}"/>
+ <copy file="${native.dirname}/${native.jnilib.dir.windows}/${native.dist.dir}/${native.jnilib.file.windows.ia64}"
+ todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.windows}"/>
++-->
+ <copy file="${native.dirname}/${native.jnilib.dir.linux}/${native.dist.dir}/${native.jnilib.file.linux.i386}"
+ todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.linux}"/>
+ <copy file="${native.dirname}/${native.jnilib.dir.linux}/${native.dist.dir}/${native.jnilib.file.linux.amd64}"
+@@ -141,7 +143,9 @@
+
+ <target name="copy-launchers">
+
++<!--
+ <antcall target="copy-windows-launcher"/>
++-->
+ <antcall target="copy-unix-launcher"/>
+
+ </target>
+@@ -151,8 +155,10 @@
+ <mkdir dir="${build.classes.dir}/${native.dirname}/${native.cleaner.windows.dir}"/>
+ <mkdir dir="${build.classes.dir}/${native.dirname}/${native.cleaner.unix.dir}"/>
+
++<!--
+ <copy file="${native.dirname}/${native.cleaner.windows.srcdir}/${native.cleaner.windows.file}"
+ todir="${build.classes.dir}/${native.dirname}/${native.cleaner.windows.dir}"/>
++-->
+ <copy file="${native.dirname}/${native.cleaner.unix.srcdir}/${native.cleaner.unix.file}"
+ todir="${build.classes.dir}/${native.dirname}/${native.cleaner.unix.dir}"/>
+
diff --git a/netbeans-platform-6.9~properties.patch b/netbeans-platform-6.9~properties.patch
new file mode 100644
index 0000000..347e894
--- /dev/null
+++ b/netbeans-platform-6.9~properties.patch
@@ -0,0 +1,12 @@
+diff -Nur netbeans-platform-6.9/o.jdesktop.layout/nbproject/project.properties netbeans-platform-6.9.new/o.jdesktop.layout/nbproject/project.properties
+--- netbeans-platform-6.9/o.jdesktop.layout/nbproject/project.properties 2010-05-31 20:58:16.000000000 +0400
++++ netbeans-platform-6.9.new/o.jdesktop.layout/nbproject/project.properties 2010-06-10 09:34:11.689150157 +0400
+@@ -42,6 +42,6 @@
+
+ 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
diff --git a/remove-binaries-from-release.patch b/netbeans-platform-6.9~release_external.patch
similarity index 100%
rename from remove-binaries-from-release.patch
rename to netbeans-platform-6.9~release_external.patch
diff --git a/netbeans-platform.spec b/netbeans-platform.spec
index 10f4272..15c2276 100644
--- a/netbeans-platform.spec
+++ b/netbeans-platform.spec
@@ -2,16 +2,18 @@
%define __jar_repack %{nil}
%define nb_ netbeans
-%define nb_major_ver 7.0
-%define nb_ver %{nb_major_ver}
+%define nb_major_ver 6.9
+%define nb_bugfix_ver 1
+%define nb_ver %{nb_major_ver}.%{nb_bugfix_ver}
-%define nb_release_time 201104080000
+%define nb_release_time 201007282301
%define nb_home %{_datadir}/%{nb_}
%define nb_dir %{nb_home}/%{nb_major_ver}
+%define nb_platform_ver 12
%define nb_platform platform
-%define nb_platform_dir %{nb_home}/%{nb_platform}
-%define nb_platform_pkg %{nb_}-%{nb_platform}
+%define nb_platform_dir %{nb_home}/%{nb_platform}%{nb_platform_ver}
+%define nb_platform_vpkg %{nb_}-%{nb_platform}%{nb_platform_ver}
%define nb_harness harness
%define nb_harness_dir %{nb_home}/%{nb_harness}
@@ -46,9 +48,9 @@
# Links the system JAR.
# %%{1} - the sys jar
# %%{2} - the symlink name/path (optional)
-%global lnSys() \
- if [ -f %{1} ] ; then \
- %__ln_s -f %{*} ; \
+%global lnSysJAR() \
+ if [ -f %{_javadir}/%{1} ] ; then \
+ %__ln_s -f %{_javadir}/%{*} ; \
else \
echo "%{1} doesn't exist." ; exit 1 ; \
fi ;
@@ -59,8 +61,9 @@
tee -a ./rmFiles.lst | xargs -t %__rm -f ;
Name: netbeans-platform
+Epoch: 1
Version: %{nb_ver}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: NetBeans Platform %{nb_platform_ver}
Group: Development/Libraries
License: GPLv2 with exceptions or CDDL
@@ -70,46 +73,38 @@ Source0: http://download.netbeans.org/%{nb_}/%{version}/final/zip/%{nb_}-%{versi
# Avoids copying the external binaries
# (*.exe *.dll) from the o.n.bootstrup/build.xml
-Patch0: remove-binaries-from-release.patch
-# Avoid looking for non-linux jna bits
-Patch1: remove-non-linux-jna-bits.patch
+Patch0: %{name}-6.9~release_external.patch
# Prevents from releasing zip files (swing-layout-1.0.4-doc.zip,
# swing-layout-1.0.4-src.zip) in the o.jdesktop.layout module
-Patch2: remove-swing-layout-src.patch
-# Do not copy non-linux jni libaries
-Patch3: remove-non-linux-jni-libs.patch
-# Build native libraries
-Patch4: build-native-code.patch
-# Fix path to native build dir
-#Patch5: native-build-properties.patch
-Patch5: fix-native-dir-paths.patch
-# Fix paths and flags in jnilib native build
-Patch6: jnilib-build-uniformly-across-archs.patch
-# Do not special case so names
-Patch7: do-not-name-sos-based-on-arch.patch
-# Do not build windows cleaners
-Patch8: no-windows-cleaners.patch
+Patch1: %{name}-6.9~properties.patch
+# Avoids copying the external binaries in nbi module
+Patch2: %{name}-6.9~nbi.patch
+# Avoids spam in the log if the -XX:+HeapDumpOnOutOfMemoryError option is not supported by the JVM
+# http://netbeans.org/bugzilla/show_bug.cgi?id=188283
+Patch3: %{name}-6.9~launcher.patch
+
+BuildArch: noarch
BuildRequires: jpackage-utils
BuildRequires: java-devel >= 1:1.6.0
-
BuildRequires: ant >= 1.7.0
BuildRequires: ant-junit >= 1.7.0
+BuildRequires: ant-nodeps >= 1.7.0
BuildRequires: ant-trax >= 1.7.0
-BuildRequires: antlr3-java
-BuildRequires: bindex >= 2.2
-BuildRequires: felix-osgi-core >= 1.4.0
-BuildRequires: felix-osgi-compendium >= 1.4.0
-BuildRequires: felix-main >= 2.0.5
-BuildRequires: felix-framework >= 2.0.5
+BuildRequires: junit4 >= 4.5
+BuildRequires: swing-layout >= 1.0
BuildRequires: javahelp2 >= 2.0.05
BuildRequires: jna >= 3.0.9
-BuildRequires: jna-contrib
-BuildRequires: junit4 >= 4.5
+BuildRequires: cobertura >= 1.9.3
+BuildRequires: objectweb-asm >= 3.0
+BuildRequires: log4j >= 1.2.9
BuildRequires: jakarta-oro >= 2.0.8
BuildRequires: jemmy >= 2.3.0.0
-BuildRequires: swing-layout >= 1.0
-BuildRequires: stringtemplate
+BuildRequires: felix-osgi-core >= 1.4.0
+BuildRequires: felix-osgi-compendium >= 1.4.0
+BuildRequires: felix-main >= 2.0.5
+BuildRequires: felix-framework >= 2.0.5
+BuildRequires: bindex >= 2.2
Requires: jpackage-utils
Requires: java >= 1:1.6.0
@@ -122,19 +117,17 @@ Requires: felix-osgi-compendium >= 1.4.0
Requires: felix-main >= 2.0.5
Requires: felix-framework >= 2.0.5
-Provides: %{nb_platform_pkg} = %{version}-%{release}
+Provides: %{nb_platform_vpkg} = %{version}-%{release}
%description
-The NetBeans Platform is a generic framework for Swing applications.
-It provides the services common to almost all large desktop
-applications: window management, menus, settings and storage, update
-management, file access, etc.
+The NetBeans Platform, version %{nb_platform_ver}, is a generic framework
+for Swing applications. It provides the services common to almost all
+large desktop applications: window management, menus, settings and
+storage, update management, file access, etc.
%package %{nb_javadoc}
-Summary: Javadoc documentation for NetBeans Platform
+Summary: Javadoc documentation for NetBeans Platform %{nb_platform_ver}
Group: Documentation
-BuildArch: noarch
-
%description %{nb_javadoc}
NetBeans Platform is a set of modules, each providing
their own APIs and working together or in a standalone
@@ -142,20 +135,19 @@ mode. This package provides one master
javadoc to all of them.
%package %{nb_harness}
-Summary: Build harness for NetBeans Platform
+Summary: Build harness for NetBeans Platform %{nb_platform_ver}
Group: Development/Libraries
-
-Requires: %{name} = %{version}-%{release}
-
Requires: jpackage-utils
-
+Requires: java >= 1:1.6.0
Requires: ant >= 1.7.0
-Requires: bindex >= 2.2
+Requires: %{name} = %{version}-%{release}
+Requires: javahelp2 >= 2.0.05
Requires: cobertura >= 1.9.3
+Requires: objectweb-asm >= 3.0
+Requires: log4j >= 1.2.9
Requires: jakarta-oro >= 2.0.8
-Requires: javahelp2 >= 2.0.05
Requires: jemmy >= 2.3.0.0
-
+Requires: bindex >= 2.2
%description %{nb_harness}
Harness with build scripts and ant tasks for everyone who
build an application on top of NetBeans Platform
@@ -167,51 +159,39 @@ build an application on top of NetBeans Platform
%rmFiles "*.zip"
%rmFiles "*.exe"
%rmFiles "*.dll"
-%rmFiles "*.so"
%rmFiles "binaries-list"
# To build the netbeans modules the system JARs will be used instead of pre-packaged ones
-%lnSys %{_javadir}/javahelp2.jar javahelp/external/jhall-2.0_05.jar
-%lnSys %{_javadir}/jemmy.jar jemmy/external/jemmy-2.3.0.0.jar
-%lnSys %{_javadir}/jna.jar libs.jna/external/jna-3.2.7.jar
-mkdir -p libs.jna/external/linux-amd64
-mkdir -p libs.jna/external/linux-i386
-%lnSys %{_libdir}/jna/libjnidispatch.so libs.jna/external/linux-amd64/libjnidispatch.so
-%lnSys %{_libdir}/jna/libjnidispatch.so libs.jna/external/linux-i386/libjnidispatch.so
-
-%lnSys %{_javadir}/junit4.jar libs.junit4/external/junit-4.8.2.jar
-%lnSys %{_javadir}/swing-layout.jar o.jdesktop.layout/external/swing-layout-1.0.4.jar
+%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.4.jar
pushd apisupport.harness/external
- %lnSys %{_javadir}/javahelp2.jar jsearch-2.0_05.jar
- %lnSys %{_javadir}/bindex.jar bindex-2.2.jar
-popd
-pushd core.nativeaccess/external
- #%lnSys %{_javadir}/jna.jar platform-3.2.7.jar
- %lnSys %{_javadir}/jna/platform.jar platform-3.2.7.jar
+ %lnSysJAR javahelp2.jar jsearch-2.0_05.jar
+ %lnSysJAR bindex.jar bindex-2.2.jar
popd
-pushd libs.antlr3.devel/external
- %lnSys %{_javadir}/antlr3-runtime.jar antlr-3.1.3.jar
- %lnSys %{_javadir}/stringtemplate.jar stringtemplate-3.2.jar
+pushd apisupport.tc.cobertura/external
+ %lnSysJAR objectweb-asm/asm-all.jar asm-3.0.jar
+ %lnSysJAR objectweb-asm/asm-all.jar asm-tree-3.0.jar
+ %lnSysJAR cobertura.jar cobertura-1.9.3.jar
+ %lnSysJAR oro.jar jakarta-oro-2.0.8.jar
+ %lnSysJAR log4j.jar log4j-1.2.9.jar
popd
pushd libs.felix/external
- %lnSys %{_javadir}/felix/org.apache.felix.framework.jar felix-2.0.3.jar
- %lnSys %{_javadir}/felix/org.apache.felix.main.jar felix-main-2.0.2.jar
+ %lnSysJAR felix/org.apache.felix.framework.jar felix-2.0.3.jar
+ %lnSysJAR felix/org.apache.felix.main.jar felix-main-2.0.2.jar
popd
pushd libs.osgi/external
- %lnSys %{_javadir}/felix/org.osgi.core.jar osgi.core-4.2.jar
- %lnSys %{_javadir}/felix/org.osgi.compendium.jar osgi.cmpn-4.2.jar
+ %lnSysJAR felix/org.osgi.core.jar osgi.core-4.2.jar
+ %lnSysJAR felix/org.osgi.compendium.jar osgi.cmpn-4.2.jar
popd
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
%build
@@ -245,15 +225,14 @@ sendopts,options.api,editor.mimelookup \
# linking the platform to the system JARs
pushd %{buildroot}%{nb_platform_dir}/modules/ext
- %lnSys %{_javadir}/felix/org.apache.felix.framework.jar felix-2.0.3.jar
- %lnSys %{_javadir}/felix/org.apache.felix.main.jar felix-main-2.0.2.jar
- %lnSys %{_javadir}/javahelp2.jar jhall-2.0_05.jar
- %lnSys %{_javadir}/jna.jar jna-3.2.7.jar
- %lnSys %{_javadir}/jna/platform.jar platform-3.2.7.jar
- %lnSys %{_javadir}/junit4.jar junit-4.5.jar
- %lnSys %{_javadir}/felix/org.osgi.compendium.jar osgi.cmpn-4.2.jar
- %lnSys %{_javadir}/felix/org.osgi.core.jar osgi.core-4.2.jar
- %lnSys %{_javadir}/swing-layout.jar swing-layout-1.0.4.jar
+ %lnSysJAR felix/org.apache.felix.framework.jar felix-2.0.3.jar
+ %lnSysJAR felix/org.apache.felix.main.jar felix-main-2.0.2.jar
+ %lnSysJAR javahelp2.jar jh-2.0_05.jar
+ %lnSysJAR jna.jar jna-3.0.9.jar
+ %lnSysJAR junit4.jar junit-4.5.jar
+ %lnSysJAR felix/org.osgi.compendium.jar osgi.cmpn-4.2.jar
+ %lnSysJAR felix/org.osgi.core.jar osgi.core-4.2.jar
+ %lnSysJAR swing-layout.jar swing-layout-1.0.4.jar
popd
# install harness
@@ -264,10 +243,19 @@ popd
# linking the harness to the system JARs
pushd %{buildroot}%{nb_harness_dir}
pushd antlib
- %lnSys %{_javadir}/bindex.jar bindex-2.2.jar
- %lnSys %{_javadir}/javahelp2.jar jsearch-2.0_05.jar
+ %lnSysJAR bindex.jar bindex-2.2.jar
+ %lnSysJAR javahelp2.jar jsearch-2.0_05.jar
+ popd
+ %lnSysJAR jemmy.jar modules/ext/jemmy-2.3.0.0.jar
+ pushd testcoverage/cobertura
+ %lnSysJAR cobertura.jar cobertura-1.9.3.jar
+ pushd lib
+ %lnSysJAR objectweb-asm/asm-all.jar asm-3.0.jar
+ %lnSysJAR objectweb-asm/asm-all.jar asm-tree-3.0.jar
+ %lnSysJAR oro.jar jakarta-oro-2.0.8.jar
+ %lnSysJAR log4j.jar log4j-1.2.9.jar
+ popd
popd
- %lnSys %{_javadir}/jemmy.jar modules/ext/jemmy-2.3.0.0.jar
popd
# install javadoc
@@ -306,6 +294,7 @@ popd
%attr(755, root, root) %{nb_harness_dir}/launchers/app.sh
%{nb_harness_dir}/modules
%{nb_harness_dir}/nbi
+%{nb_harness_dir}/testcoverage
%{nb_harness_dir}/update_tracking
%doc %{nb_harness_dir}/README
%{nb_harness_dir}/build.xml
@@ -317,6 +306,8 @@ popd
%{nb_harness_dir}/run.xml
%{nb_harness_dir}/suite.xml
%{nb_harness_dir}/tasks.jar
+%{nb_harness_dir}/testcoverage-suite.xml
+%{nb_harness_dir}/testcoverage.xml
%{nb_harness_dir}/.noautoupdate
%{nb_harness_dir}/.lastModified
@@ -326,6 +317,9 @@ popd
%doc nbbuild/licenses/CDDL-GPL-2-CP
%changelog
+* Tue Aug 30 2011 Deepak Bhole <dbhole at redhat.com> - 6.9.1-2
+- Revert to 6.9, bump epoch
+
* Mon Jun 6 2011 Omair Majid <omajid at redhat.com> - 7.0-2
- Remove version numbers from descriptions and summaries.
diff --git a/sources b/sources
index 1b68a78..0dbceb3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cca460a51a53444c12fcec1397f85547 netbeans-7.0-201104080000-platform-src.zip
+d8fdbe26d0a51bcd54e8ffde363141e7 netbeans-6.9.1-201007282301-platform-src.zip
More information about the scm-commits
mailing list