rpms/java-1.6.0-openjdk/devel .cvsignore, 1.43, 1.44 java-1.6.0-openjdk.spec, 1.81, 1.82 sources, 1.45, 1.46

[Lillian Angel]

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9920

Modified Files:
	.cvsignore java-1.6.0-openjdk.spec sources 
Log Message:
* Mon Oct 27 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-1.2.b12
- Added netbeans requirement for devel package.
- Fixed removal of gcjwebplugin.so link when installing plugin package.
- Updated Release.
- Resolves: rhbz#468635




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	22 Oct 2008 21:26:46 -0000	1.43
+++ .cvsignore	27 Oct 2008 15:09:52 -0000	1.44
@@ -4,5 +4,5 @@
 visualvm-20080728-src.tar.gz
 netbeans-profiler-visualvm_preview2.tar.gz
 netbeans-6.1-200805300101-basic_cluster-src.zip
-icedtea6-1.3.1.tar.gz
 mauve-2008-10-22.tar.gz
+icedtea6-1.3.1.tar.gz


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- java-1.6.0-openjdk.spec	24 Oct 2008 19:43:28 -0000	1.81
+++ java-1.6.0-openjdk.spec	27 Oct 2008 15:09:52 -0000	1.82
@@ -108,7 +108,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 1.1.%{openjdkver}%{?dist}
+Release: 1.2.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -202,11 +202,6 @@
 %endif
 # visualvm build requirements.
 BuildRequires: netbeans
-BuildRequires: netbeans-platform8
-BuildRequires: netbeans-platform8-harness
-BuildRequires: netbeans-apisupport1
-BuildRequires: netbeans-java2
-BuildRequires: netbeans-ide9
 BuildRequires: jakarta-commons-logging
 
 Requires: rhino
@@ -261,6 +256,8 @@
 
 # Require base package.
 Requires:         %{name} = %{epoch}:%{version}-%{release}
+# Requirements for jvisualvm
+Requires:         netbeans
 # Post requires alternatives to install tool alternatives.
 Requires(post):   %{_sbindir}/alternatives
 # Postun requires alternatives to uninstall tool alternatives.
@@ -574,7 +571,6 @@
   --slave %{_jvmdir}/jre jre %{_jvmdir}/%{jrelnk} \
   --slave %{_jvmjardir}/jre jre_exports %{_jvmjardir}/%{jrelnk} \
   --slave %{_bindir}/javaws javaws %{jrebindir}/javaws \
-  --slave %{_bindir}/jvisualvm jvisualvm %{jrebindir}/jvisualvm \
   --slave %{_bindir}/keytool keytool %{jrebindir}/keytool \
   --slave %{_bindir}/orbd orbd %{jrebindir}/orbd \
   --slave %{_bindir}/pack200 pack200 %{jrebindir}/pack200 \
@@ -773,8 +769,11 @@
 exit 0
 
 %post plugin
-alternatives --remove %{javaplugin} \
+if [ $1 -eq 0 ]
+then
+  alternatives --remove %{javaplugin} \
     %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so
+fi
 
 alternatives \
   --install %{syslibdir}/mozilla/plugins/libjavaplugin.so %{javaplugin} \
@@ -899,6 +898,12 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Mon Oct 27 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-1.2.b12
+- Added netbeans requirement for devel package.
+- Fixed removal of gcjwebplugin.so link when installing plugin package.
+- Updated Release.
+- Resolves: rhbz#468635
+
 * Fri Oct 24 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-1.1.b12
 - Removed --enable-pulse-java. Causes some TCK tests to fail.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	24 Oct 2008 18:25:07 -0000	1.45
+++ sources	27 Oct 2008 15:09:52 -0000	1.46
@@ -5,4 +5,4 @@
 ff8e8abc42df6c6749e6b02bcf7bb0a5  netbeans-profiler-visualvm_preview2.tar.gz
 a7ea855f475fa3a982f094a45c155ab4  netbeans-6.1-200805300101-basic_cluster-src.zip
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
-3e427a4b1fa2655f473f2492357c1612  icedtea6-1.3.1.tar.gz
+f510047a614a9a9d623ed8d8cd689b2b  icedtea6-1.3.1.tar.gz