rpms/java-1.6.0-openjdk/EL-5 .cvsignore, 1.15, 1.16 java-1.6.0-openjdk-makefile.patch, 1.5, 1.6 java-1.6.0-openjdk.spec, 1.29, 1.30 sources, 1.16, 1.17

Lubomir Rintel lkundrak at fedoraproject.org
Sat Oct 25 09:02:48 UTC 2008 

Author: lkundrak

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

Modified Files:
	.cvsignore java-1.6.0-openjdk-makefile.patch 
	java-1.6.0-openjdk.spec sources 
Log Message:
* Fri Oct 24 2008 Lubomir Rintel <lkundrak at v3.sk> - 1:1.6.0.0-1.0.b12.1
- Merge 1.3.1 with IcedTeaPlugin from devel.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	21 Jul 2008 21:06:56 -0000	1.15
+++ .cvsignore	25 Oct 2008 09:02:17 -0000	1.16
@@ -1,5 +1,5 @@
-mauve-2008-03-11.tar.gz
 mauve_tests
-openjdk-6-src-b11-10_jul_2008-fedora.tar.gz
 java-access-bridge-1.23.0.tar.gz
-icedtea6-1.3-30aed052fabd0303b4001763652b94c054fa59e7.tar.gz
+openjdk-6-src-b12-28_aug_2008-fedora.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/EL-5/java-1.6.0-openjdk-makefile.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- java-1.6.0-openjdk-makefile.patch	16 Oct 2008 08:47:44 -0000	1.5
+++ java-1.6.0-openjdk-makefile.patch	25 Oct 2008 09:02:17 -0000	1.6
@@ -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/EL-5/java-1.6.0-openjdk.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- java-1.6.0-openjdk.spec	16 Oct 2008 08:47:44 -0000	1.29
+++ java-1.6.0-openjdk.spec	25 Oct 2008 09:02:17 -0000	1.30
@@ -4,9 +4,9 @@
 %define gcjbootstrap 0
 
 # If runtests is 0 test suites will not be run.
-%define runtests 1
+%define runtests 0
 
-%define icedteaver 1.3
+%define icedteaver 1.3.1
 %define icedteasnapshot %{nil}
 %define openjdkver b12
 %define openjdkdate 28_aug_2008
@@ -22,7 +22,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
 
@@ -105,7 +105,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.23.%{openjdkver}%{?dist}.1
+Release: 1.0.%{openjdkver}%{?dist}.1
 # 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
@@ -182,10 +182,12 @@
 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
 # Zero-assembler build requirement.
 %ifnarch %{jit_arches}
 BuildRequires: libffi-devel
@@ -517,7 +519,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.
@@ -754,9 +756,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
 
@@ -764,7 +769,7 @@
 if [ $1 -eq 0 ]
 then
   alternatives --remove %{javaplugin} \
-    %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so
+    %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaPlugin.so
 fi
 
 exit 0
@@ -873,12 +878,15 @@
 %files plugin
 %defattr(-,root,root,-)
 %doc README.plugin
-%{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
+%{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Fri Oct 24 2008 Lubomir Rintel <lkundrak at v3.sk> - 1:1.6.0.0-1.0.b12.1
+- Merge 1.3.1 with IcedTeaPlugin from devel.
+
 * Wed Oct 15 2008 Lubomir Rintel <lkundrak at v3.sk> - 1:1.6.0-0.23.b12.1
-- Merge from devel
-- Update to 1.3 release
+- Merge from devel.
+- Update to 1.3 release.
 
 * Wed Jul 23 2008 Lubomir Rintel <lkundrak at v3.sk> - 1:1.6.0-0.20.b11
 - Specify vendor for javaws desktop entry.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	16 Oct 2008 08:47:44 -0000	1.16
+++ sources	25 Oct 2008 09:02:17 -0000	1.17
@@ -1,5 +1,5 @@
-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
-70f03710342ada84bb3f0a1543017721  icedtea6-1.3.tar.gz
+a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
+3e427a4b1fa2655f473f2492357c1612  icedtea6-1.3.1.tar.gz

More information about the scm-commits mailing list