rpms/java-1.6.0-openjdk/devel .cvsignore, 1.42, 1.43 java-1.6.0-openjdk-makefile.patch, 1.10, 1.11 java-1.6.0-openjdk.spec, 1.76, 1.77 sources, 1.43, 1.44

Lillian Angel langel at fedoraproject.org
Wed Oct 22 21:27:17 UTC 2008 

Author: langel

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

Modified Files:
	.cvsignore java-1.6.0-openjdk-makefile.patch 
	java-1.6.0-openjdk.spec sources 
Log Message:
* Tue Oct 20 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-1.0.b12
- Updated icedteaver.
- Updated Release.
- Changed to use IcedTeaPlugin.so instead of gcjwebplugin.so. Includes
LiveConnect support.
- Updated mauvedate.
- Added xulrunner-devel and xulrunner-devel-unstable as build requirements.
- Enabled building of pulse-java, not default sound implementation though.
- Added build requirements for pulse-java.
- Resolves: rhbz#468043
- Resolves: rhbz#375161
- Resolves: rhbz#432184
- Resolves: rhbz#302071
- Resolves: rhbz#457536
- Resolves: rhbz#460236
- Resolves: rhbz#460084
- Resolves: rhbz#467794




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	15 Oct 2008 17:05:17 -0000	1.42
+++ .cvsignore	22 Oct 2008 21:26:46 -0000	1.43
@@ -1,8 +1,8 @@
-mauve-2008-03-11.tar.gz
 mauve_tests
 java-access-bridge-1.23.0.tar.gz
 openjdk-6-src-b12-28_aug_2008-fedora.tar.gz
 visualvm-20080728-src.tar.gz
 netbeans-profiler-visualvm_preview2.tar.gz
 netbeans-6.1-200805300101-basic_cluster-src.zip
-icedtea6-1.3.tar.gz
+icedtea6-1.3.1.tar.gz
+mauve-2008-10-22.tar.gz

java-1.6.0-openjdk-makefile.patch:

Index: java-1.6.0-openjdk-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk-makefile.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- java-1.6.0-openjdk-makefile.patch	2 Oct 2008 21:14:48 -0000	1.10
+++ java-1.6.0-openjdk-makefile.patch	22 Oct 2008 21:26:47 -0000	1.11
@@ -1,11 +1,12 @@
-diff -r 09dcedbe63a8 Makefile.am
---- oldMakefile.am	Thu Oct 02 10:55:55 2008 -0400
-+++ Makefile.am	Thu Oct 02 15:12:05 2008 -0400
-@@ -330,44 +330,6 @@
+--- makefileam	2008-10-22 11:46:24.000000000 -0400
++++ Makefile.am	2008-10-22 11:47:10.000000000 -0400
+@@ -350,46 +350,6 @@
  endif
  endif
  endif
 -if WITH_VISUALVM
+-if USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP
+-else
 -	if ! echo "$(NETBEANS_BASIC_CLUSTER_MD5SUM) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP)" \
 -	  | $(MD5SUM) --check ; \
 -	then \
@@ -16,7 +17,7 @@
 -	$(WGET) $(NETBEANS_BASIC_CLUSTER_URL)$(NETBEANS_BASIC_CLUSTER_SRC_ZIP) \
 -	  -O $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ; \
 -	fi
--
+-endif
 -if USE_ALT_NETBEANS_PROFILER_SRC_ZIP
 -else
 -	if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \
@@ -46,15 +47,15 @@
  	mkdir -p stamps
  	touch stamps/download.stamp
  
-@@ -527,7 +489,6 @@
+@@ -562,7 +522,6 @@
  	  mkdir openjdk ; \
  	  $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \
  	  chmod -R ug+w openjdk ; \
--	  sh $(srcdir)/fsg.sh ; \
+-	  sh $(abs_top_srcdir)/fsg.sh ; \
  	fi
  if WITH_CACAO
  if !USE_SYSTEM_CACAO
-@@ -570,7 +531,7 @@
+@@ -607,7 +566,7 @@
  clean-extract:
  	rm -f stamps/extract.stamp
  


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.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- java-1.6.0-openjdk.spec	15 Oct 2008 17:05:17 -0000	1.76
+++ java-1.6.0-openjdk.spec	22 Oct 2008 21:26:47 -0000	1.77
@@ -6,7 +6,7 @@
 # If runtests is 0 test suites will not be run.
 %define runtests 0
 
-%define icedteaver 1.3
+%define icedteaver 1.3.1
 %define icedteasnapshot %{nil}
 %define openjdkver b12
 %define openjdkdate 28_aug_2008
@@ -25,7 +25,7 @@
 %define openjdkurl %{openjdkurlbase}%{openjdkver}/
 %define fedorazip  openjdk-6-src-%{openjdkver}-%{openjdkdate}-fedora.tar.gz
 
-%define mauvedate 2008-03-11
+%define mauvedate 2008-10-22
 
 %define multilib_arches ppc64 sparc64 x86_64
 
@@ -55,7 +55,7 @@
 %if %{gcjbootstrap}
 %define icedteaopt %{nil}
 %else
-%define icedteaopt --with-openjdk
+%define icedteaopt --with-openjdk --with-alt-jar=%{_bindir}/gjar
 %endif
 
 # Convert an absolute path to a relative path.  Each symbolic link is
@@ -108,7 +108,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.23.%{openjdkver}%{?dist}
+Release: 1.0.%{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
@@ -187,10 +187,15 @@
 BuildRequires: libbonobo-devel
 BuildRequires: pkgconfig >= 0.9.0
 BuildRequires: xorg-x11-utils
-# gcjwebplugin build requirements.
+# IcedTeaPlugin build requirements.
 BuildRequires: gecko-devel
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
+BuildRequires: xulrunner-devel
+BuildRequires: xulrunner-devel-unstable
+# PulseAudio build requirements.
+BuildRequires: pulseaudio-libs-devel
+BuildRequires: pulseaudio
 # Zero-assembler build requirement.
 %ifnarch %{jit_arches}
 BuildRequires: libffi-devel
@@ -363,7 +368,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 \
+ --enable-pulse-java
 %if %{gcjbootstrap}
 make stamps/patch-ecj.stamp
 %endif
@@ -529,7 +535,7 @@
 # Find JRE files.
 find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type f -o -type l \
   | grep -v jre/lib/security \
-  | grep -v gcjwebplugin.so \
+  | grep -v IcedTeaPlugin.so \
   | sed 's|'$RPM_BUILD_ROOT'||' \
   >> %{name}.files
 # Find demo directories.
@@ -569,6 +575,7 @@
   --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 \
@@ -767,9 +774,12 @@
 exit 0
 
 %post plugin
+alternatives --remove %{javaplugin} \
+    %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so
+
 alternatives \
   --install %{syslibdir}/mozilla/plugins/libjavaplugin.so %{javaplugin} \
-  %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so %{priority}
+  %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaPlugin.so %{priority}
 
 exit 0
 
@@ -777,7 +787,7 @@
 if [ $1 -eq 0 ]
 then
   alternatives --remove %{javaplugin} \
-    %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so
+    %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaPlugin.so
 fi
 
 exit 0
@@ -818,7 +828,6 @@
 %{_mandir}/man1/unpack200-%{name}.1*
 %{_datadir}/pixmaps/javaws.png
 %{_datadir}/applications/javaws.desktop
-%{_datadir}/applications/visualvm.desktop
 
 %files devel
 %defattr(-,root,root,-)
@@ -865,6 +874,7 @@
 %{_mandir}/man1/wsgen-%{name}.1*
 %{_mandir}/man1/wsimport-%{name}.1*
 %{_mandir}/man1/xjc-%{name}.1*
+%{_datadir}/applications/visualvm.desktop
 
 %files demo -f %{name}-demo.files
 %defattr(-,root,root,-)
@@ -887,9 +897,27 @@
 %files plugin
 %defattr(-,root,root,-)
 %doc README.plugin
-%{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
+%{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Tue Oct 20 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-1.0.b12
+- Updated icedteaver.
+- Updated Release.
+- Changed to use IcedTeaPlugin.so instead of gcjwebplugin.so. Includes 
+LiveConnect support.
+- Updated mauvedate.
+- Added xulrunner-devel and xulrunner-devel-unstable as build requirements.
+- Enabled building of pulse-java, not default sound implementation though.
+- Added build requirements for pulse-java.
+- Resolves: rhbz#468043 
+- Resolves: rhbz#375161 
+- Resolves: rhbz#432184 
+- Resolves: rhbz#302071 
+- Resolves: rhbz#457536 
+- Resolves: rhbz#460236 
+- Resolves: rhbz#460084
+- Resolves: rhbz#467794
+
 * Tue Oct 14 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.23.b12
 - Updated icedteasnapshot to nil.
 - Updated release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	15 Oct 2008 17:14:35 -0000	1.43
+++ sources	22 Oct 2008 21:26:47 -0000	1.44
@@ -1,8 +1,8 @@
-079e5dc01f2a8720ee3b3dd39119a601  mauve-2008-03-11.tar.gz
 7a0c160c03012cd40957a7a112e25038  mauve_tests
 1db4280d3228f20ad39ad22382ce2b00  java-access-bridge-1.23.0.tar.gz
 482c858d25959c0cb77c1fa59161ce2a  openjdk-6-src-b12-28_aug_2008-fedora.tar.gz
 4b55bc623418818793392bb233da2927  visualvm-20080728-src.tar.gz
 ff8e8abc42df6c6749e6b02bcf7bb0a5  netbeans-profiler-visualvm_preview2.tar.gz
 a7ea855f475fa3a982f094a45c155ab4  netbeans-6.1-200805300101-basic_cluster-src.zip
-70f03710342ada84bb3f0a1543017721  icedtea6-1.3.tar.gz
+a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
+c16034809a94e416d21970edcfdf0ddc  icedtea6-1.3.1.tar.gz

More information about the scm-commits mailing list