rpms/java-1.6.0-openjdk/devel .cvsignore, 1.45, 1.46 java-1.6.0-openjdk.spec, 1.83, 1.84 sources, 1.47, 1.48

[Lillian Angel]

Author: langel

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

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-2b12
- Updated icedteasnapshot.
- Fixed post scriptlet to remove gcjwebplugin.so.
- Updated jvisualvm requirement.
- Added build option --with-pkgversion=6b12-Fedora-10
- Resolves: rhbz#428503
- Resolves: rhbz#251829
- Resolves: rhbz#415061
- Resolves: rhbz#452188




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	27 Oct 2008 15:29:54 -0000	1.45
+++ .cvsignore	27 Oct 2008 20:04:26 -0000	1.46
@@ -5,4 +5,4 @@
 netbeans-profiler-visualvm_preview2.tar.gz
 netbeans-6.1-200805300101-basic_cluster-src.zip
 mauve-2008-10-22.tar.gz
-icedtea6-1.3.1-fda32eba4b37732cf5cd31d6157c7457cba57074.tar.gz
+icedtea6-1.3.1-f31cffd9e5c8dffeb09bece53a32d64c3bc0a342.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.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- java-1.6.0-openjdk.spec	27 Oct 2008 15:29:54 -0000	1.83
+++ java-1.6.0-openjdk.spec	27 Oct 2008 20:04:26 -0000	1.84
@@ -7,7 +7,7 @@
 %define runtests 0
 
 %define icedteaver 1.3.1
-%define icedteasnapshot -fda32eba4b37732cf5cd31d6157c7457cba57074
+%define icedteasnapshot -f31cffd9e5c8dffeb09bece53a32d64c3bc0a342
 %define openjdkver b12
 %define openjdkdate 28_aug_2008
 
@@ -108,7 +108,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 1.2.%{openjdkver}%{?dist}
+Release: 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
@@ -365,7 +365,8 @@
 %ifarch sparc64
 export ARCH_DATA_MODEL=64
 %endif
-./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} --enable-visualvm
+./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} --enable-visualvm \
+  --with-pkgversion=6%{openjdkver}-Fedora-%{fedora}
 %if %{gcjbootstrap}
 make stamps/patch-ecj.stamp
 %endif
@@ -769,7 +770,7 @@
 exit 0
 
 %post plugin
-if [ $1 -eq 0 ]
+if [ $1 -eq 2 ]
 then
   alternatives --remove %{javaplugin} \
     %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so
@@ -898,9 +899,15 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
-* Mon Oct 27 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-1.2.b12
+* Mon Oct 27 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-2b12
 - Updated icedteasnapshot.
+- Fixed post scriptlet to remove gcjwebplugin.so.
 - Updated jvisualvm requirement.
+- Added build option --with-pkgversion=6b12-Fedora-10
+- Resolves: rhbz#428503
+- Resolves: rhbz#251829
+- Resolves: rhbz#415061
+- Resolves: rhbz#452188
 
 * Mon Oct 27 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-1.2.b12
 - Added netbeans requirement for devel package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	27 Oct 2008 15:29:54 -0000	1.47
+++ sources	27 Oct 2008 20:04:26 -0000	1.48
@@ -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
-e062173a7f4224e3f2a37d030e7e0fd5  icedtea6-1.3.1-fda32eba4b37732cf5cd31d6157c7457cba57074.tar.gz
+6865c25cbc087e4142031a846b71ae56  icedtea6-1.3.1-f31cffd9e5c8dffeb09bece53a32d64c3bc0a342.tar.gz