[netbeans-platform] (1) Enable both bindex and felix-main (2) A license file for the javadoc subpackage

[Victor G. Vasilyev]

commit 70f6cf47e446beb013ef4d0e5dfa3e83f53e8c0b
Author: Victor G. Vasilyev <victor.vasilyev at sun.com>
Date:   Sat Jul 31 09:29:47 2010 +0400

    (1) Enable both bindex and felix-main
    (2) A license file for the javadoc subpackage

 netbeans-platform-6.9-no_bindex.patch     |   12 --------
 netbeans-platform-6.9-no_felix-main.patch |   12 --------
 netbeans-platform.spec                    |   42 +++++++++-------------------
 3 files changed, 14 insertions(+), 52 deletions(-)
---
diff --git a/netbeans-platform.spec b/netbeans-platform.spec
index 2821953..46e06ff 100644
--- a/netbeans-platform.spec
+++ b/netbeans-platform.spec
@@ -60,7 +60,7 @@
 
 Name:         netbeans-platform
 Version:      %{nb_ver}
-Release:      2%{?dist}
+Release:      3%{?dist}
 Summary:      NetBeans Platform %{nb_platform_ver}
 Group:        Development/Libraries
 License:      GPLv2 with exceptions or CDDL
@@ -80,12 +80,6 @@ Patch2: %{name}-%{version}~nbi.patch
 # http://netbeans.org/bugzilla/show_bug.cgi?id=188283
 Patch3: %{name}-%{version}~launcher.patch
 
-# TODO no_bindex
-Patch4: %{name}-%{version}-no_bindex.patch
-# TODO no_felix-main
-Patch5: %{name}-%{version}-no_felix-main.patch
-
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -106,11 +100,9 @@ BuildRequires: jakarta-oro >= 2.0.8
 BuildRequires: jemmy >= 2.3.0.0
 BuildRequires: felix-osgi-core >= 1.4.0
 BuildRequires: felix-osgi-compendium >= 1.4.0
-# TODO no_felix-main
-#BuildRequires: felix-main >= 2.0.5
+BuildRequires: felix-main >= 2.0.5
 BuildRequires: felix-framework >= 2.0.5
-# TODO no_bindex
-#BuildRequires: bindex >= 2.2
+BuildRequires: bindex >= 2.2
 
 Requires: jpackage-utils
 Requires: java >= 1:1.6.0
@@ -120,8 +112,7 @@ Requires: javahelp2 >= 2.0.05
 Requires: jna >= 3.0.9
 Requires: felix-osgi-core >= 1.4.0
 Requires: felix-osgi-compendium >= 1.4.0
-# TODO no_felix-main
-#Requires: felix-main >= 2.0.5
+Requires: felix-main >= 2.0.5
 Requires: felix-framework >= 2.0.5
 
 Provides: %{nb_platform_vpkg} = %{version}-%{release}
@@ -154,8 +145,7 @@ Requires: objectweb-asm >= 3.0
 Requires: log4j >= 1.2.9
 Requires: jakarta-oro >= 2.0.8
 Requires: jemmy >= 2.3.0.0
-# TODO no_bindex
-#Requires: bindex >= 2.2
+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
@@ -178,8 +168,7 @@ build an application on top of NetBeans Platform
 
 pushd apisupport.harness/external
   %lnSysJAR javahelp2.jar jsearch-2.0_05.jar
-# TODO no_bindex
-#  %%lnSysJAR bindex.jar bindex-2.2.jar
+  %lnSysJAR bindex.jar bindex-2.2.jar
 popd
 pushd apisupport.tc.cobertura/external
   %lnSysJAR objectweb-asm/asm-all.jar asm-3.0.jar
@@ -190,8 +179,7 @@ pushd apisupport.tc.cobertura/external
 popd
 pushd libs.felix/external
   %lnSysJAR felix/org.apache.felix.framework.jar felix-2.0.3.jar
-# TODO no_felix-main
-#  %%lnSysJAR felix/org.apache.felix.main.jar felix-main-2.0.2.jar
+  %lnSysJAR felix/org.apache.felix.main.jar felix-main-2.0.2.jar
 popd
 pushd libs.osgi/external
   %lnSysJAR felix/org.osgi.core.jar osgi.core-4.2.jar
@@ -203,11 +191,6 @@ popd
 %patch2 -p1
 %patch3 -p1
 
-# TODO no_bindex
-%patch4 -p1
-# TODO no_felix-main
-%patch5 -p1
-
 %build
 
 # build platform & harness
@@ -243,8 +226,7 @@ sendopts,options.api,editor.mimelookup \
 # linking the platform to the system JARs
 pushd %{buildroot}%{nb_platform_dir}/modules/ext
   %lnSysJAR felix/org.apache.felix.framework.jar felix-2.0.3.jar
-# TODO no_felix-main
-#  %%lnSysJAR felix/org.apache.felix.main.jar felix-main-2.0.2.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
@@ -261,8 +243,7 @@ popd
 # linking the harness to the system JARs
 pushd %{buildroot}%{nb_harness_dir}
   pushd antlib
-#TODO no_bindex
-#    %%lnSysJAR bindex.jar bindex-2.2.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
@@ -335,8 +316,13 @@ popd
 %files %{nb_javadoc}
 %defattr(-,root,root,-)
 %doc %{nb_javadoc_dir}/
+%doc nbbuild/licenses/CDDL-GPL-2-CP
 
 %changelog
+* Sat Jul 31 2010 Victor Vasilyev <victor.vasilyev at sun.com> 6.9-3
+- Enable both bindex and felix-main
+- Add a license file to the independent javadoc subpackage
+
 * Tue Jul 27 2010 Victor Vasilyev <victor.vasilyev at sun.com> 6.9-2
 - no_bindex.patch https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=610079
 - no_felix-main.patch https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=609142