[netbeans-platform] Update to netbeans-platform 7.0.1

Omair Majid omajid at fedoraproject.org
Tue Oct 18 22:08:20 UTC 2011


commit 75822baab162b14a86382eb587983de6112ffd24
Author: Omair Majid <omajid at redhat.com>
Date:   Tue Oct 18 18:08:05 2011 -0400

    Update to netbeans-platform 7.0.1

 .gitignore             |    1 +
 netbeans-platform.spec |   18 ++++++++++--------
 sources                |    2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a881ced..410a217 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 netbeans-6.9-201006101454-platform-src.zip
 /netbeans-6.9.1-201007282301-platform-src.zip
 /netbeans-7.0-201104080000-platform-src.zip
+/netbeans-7.0.1-201107282000-platform-src.zip
diff --git a/netbeans-platform.spec b/netbeans-platform.spec
index f3af0d0..e55eead 100644
--- a/netbeans-platform.spec
+++ b/netbeans-platform.spec
@@ -3,15 +3,15 @@
 
 %define nb_             netbeans
 %define nb_major_ver    7.0
-%define nb_ver          %{nb_major_ver}
+%define nb_minor_ver    1
+%define nb_ver          %{nb_major_ver}.%{nb_minor_ver}
 
-%define nb_release_time 201104080000
+%define nb_release_time 201107282000
 %define nb_home         %{_datadir}/%{nb_}
 %define nb_dir          %{nb_home}/%{nb_major_ver}
 
 %define nb_platform     platform
 %define nb_platform_dir %{nb_home}/%{nb_platform}
-%define nb_platform_pkg %{nb_}-%{nb_platform}
 
 %define nb_harness      harness
 %define nb_harness_dir  %{nb_home}/%{nb_harness}
@@ -20,7 +20,7 @@
 %define nb_javadoc_dir  %{_javadocdir}/%{nb_}-%{nb_platform}
 
 %define compiler_opt    -Dbuild.compiler.deprecation=false -Dbuild.compiler.debug=false
-%define jdk_opt         -Dpermit.jdk6.builds=true -Dnbjdk.home=%{_jvmdir}/java-1.6.0
+%define jdk_opt         -Dpermit.jdk6.builds=true -Dpermit.jdk7.builds=true
 %define verify_opt      -Dverify.checkout=false
 %define ant_nb_opt      %{ant} %{jdk_opt} %{compiler_opt} %{verify_opt}
 
@@ -63,8 +63,8 @@
 Name:         netbeans-platform
 Epoch:        1
 Version:      %{nb_ver}
-Release:      4%{?dist}
-Summary:      NetBeans Platform %{nb_platform_ver}
+Release:      1%{?dist}
+Summary:      NetBeans Platform
 Group:        Development/Libraries
 License:      GPLv2 with exceptions or CDDL
 URL:          http://platform.netbeans.org
@@ -125,8 +125,6 @@ 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}
-
 %description
 The NetBeans Platform is a generic framework for Swing applications.
 It provides the services common to almost all large desktop
@@ -345,6 +343,10 @@ popd
 %doc nbbuild/licenses/CDDL-GPL-2-CP
 
 %changelog
+* Tue Oct 18 2011 Omair Majid <omajid at redhat.com> - 1:7.0.1-1
+- Update to 7.0.1
+- Build with the default jdk
+
 * Tue Sep 20 2011 Ville Skyttä <ville.skytta at iki.fi> - 1:7.0-4
 - Force build with JDK 1.6.0.
 - Bump Epoch to match pre-7.0 releases.
diff --git a/sources b/sources
index 1b68a78..01038c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cca460a51a53444c12fcec1397f85547  netbeans-7.0-201104080000-platform-src.zip
+6ebf5145b3abb59f0b1567dd42a00a14  netbeans-7.0.1-201107282000-platform-src.zip


More information about the scm-commits mailing list