packages: icedtea6/TODO, icedtea6/icedtea6.spec, icedtea6/icedtea6-rpath.pa...

Wed Mar 21 14:30:42 CET 2012

Author: jajcus                       Date: Wed Mar 21 13:30:42 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Version: 1.11.1

---- Files affected:
packages/icedtea6:
   TODO (1.9 -> 1.10) , icedtea6.spec (1.83 -> 1.84) , icedtea6-rpath.patch (1.2 -> NONE)  (REMOVED), icedtea6-xul.patch (1.1 -> NONE)  (REMOVED), openjdk-__LEAF.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/icedtea6/TODO
diff -u packages/icedtea6/TODO:1.9 packages/icedtea6/TODO:1.10

--- packages/icedtea6/TODO:1.9	Sat Apr 17 16:20:12 2010
+++ packages/icedtea6/TODO	Wed Mar 21 14:30:37 2012
@@ -1,4 +1,3 @@
 - desktop files, icons, etc. Some of these are included in the source root dir
 - maybe build Shark VM, at least on i486, as the zero-assembly VM is very slow
-- javaws manual on x86_64 (it is not installed for some reason)
 - pass %{rpmcflags} to build

================================================================
Index: packages/icedtea6/icedtea6.spec
diff -u packages/icedtea6/icedtea6.spec:1.83 packages/icedtea6/icedtea6.spec:1.84
--- packages/icedtea6/icedtea6.spec:1.83	Wed Mar 21 13:12:31 2012
+++ packages/icedtea6/icedtea6.spec	Wed Mar 21 14:30:37 2012
@@ -4,8 +4,6 @@
 #   it to use system fonts (is it possible?).
 
 %bcond_with bootstrap	# don't use an installed icedtea6, use ecj instead
-%bcond_with plugin	# build browser plugin (icedtea-web is recommended instead)
-%bcond_with webstart	# build webstart (icedtea-web is recommended instead)
 %bcond_without nss	# don't use NSS
 
 %if %{with bootstrap}
@@ -17,32 +15,28 @@
 # class data version seen with file(1) that this jvm is able to load
 %define		_classdataversion 50.0
 # JDK/JRE version, as returned with `java -version`, '_' replaced with '.'
-%define		_jdkversion 1.6.0.20
+%define		_jdkversion 1.6.0.24
 
 Summary:	OpenJDK and GNU Classpath code
 Summary(pl.UTF-8):	Kod OpenJDK i GNU Classpath
 Name:		icedtea6
-Version:	1.9.13
-Release:	1
+Version:	1.11.1
+Release:	0.1
 License:	GPL v2
 Group:		Development/Languages/Java
 Source0:	http://icedtea.classpath.org/download/source/%{name}-%{version}.tar.gz
-# Source0-md5:	6a5c0d0ad2fe4bdb6cd851bcc24eac31
+# Source0-md5:	e51d9d2f0328cc5aa7a00943abd96ed6
 # following sources should match those in Makefile.am
-Source1:	http://download.java.net/openjdk/jdk6/promoted/b20/openjdk-6-src-b20-21_jun_2010.tar.gz
-# Source1-md5:	0b36adbf67e4f261e1b827ed4be4f447
-Source2:	http://icedtea.classpath.org/download/drops/jdk6-jaxws-b20.zip
-# Source2-md5:	91adfd41e6f001add4f92ae31216b1e3
+Source1:	http://download.java.net/openjdk/jdk6/promoted/b24/openjdk-6-src-b24-14_nov_2011.tar.gz
+# Source1-md5:	0eabdd360169144336e50081b8d01001
+Source2:	http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip
+# Source2-md5:	8fd91b09b643a19a912b8a75e7a7a9d5
 Source3:	http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip
 # Source3-md5:	bc95c133620bd68c161cac9891592901
-Source4:	http://icedtea.classpath.org/download/drops/jdk6-jaxp-b20.zip
-# Source4-md5:	22e95fbdb9fb7d8b6b6fc0a1d76d1fbd
+Source4:	http://icedtea.classpath.org/download/drops/jaxp144_03.zip
+# Source4-md5:	9eea471ad474040265c688858fcf09aa
 Patch0:		%{name}-i486.patch
-Patch1:		%{name}-rpath.patch
-Patch2:		%{name}-xul.patch
-Patch3:		%{name}-libpath.patch
-# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7103224
-Patch4:		openjdk-__LEAF.patch
+Patch1:		%{name}-libpath.patch
 URL:		http://icedtea.classpath.org/wiki/Main_Page
 BuildRequires:	alsa-lib-devel
 BuildRequires:	ant-nodeps
@@ -61,7 +55,7 @@
 BuildRequires:	gtk+2-devel
 BuildRequires:	java-rhino
 BuildRequires:	java-xalan
-BuildRequires:	java-xerces
+%{?with_bootstrap:BuildRequires:	java-xerces}
 %buildrequires_jdk
 BuildRequires:	libffi-devel
 BuildRequires:	libjpeg-devel
@@ -81,13 +75,11 @@
 BuildRequires:	xorg-lib-libXtst-devel
 BuildRequires:	xorg-proto-printproto-devel
 BuildRequires:	xorg-proto-xproto-devel
-%{?with_plugin:BuildRequires:	xulrunner-devel}
 BuildRequires:	zip
 BuildRequires:	zlib-devel
 Requires:	%{name}-appletviewer = %{version}-%{release}
 Requires:	%{name}-jdk = %{version}-%{release}
 Suggests:	%{name}-jre-X11
-Suggests:	browser-plugin-java-icedtea-web
 Suggests:	icedtea-web
 Obsoletes:	java5-sun
 Obsoletes:	java5-sun-jre
@@ -301,26 +293,6 @@
 Biblioteki obsługi czcionek dla OpenJDK zbudowane wyłącznie przy
 użyciu wolnego oprogramowania.
 
-%package jre-base-mozilla-plugin
-Summary:	IceTea Java plugin for WWW browsers
-Summary(pl.UTF-8):	Wtyczka Javy do przeglądarek WWW
-Group:		Development/Languages/Java
-Requires:	%{name}-jre-base-X11 = %{version}-%{release}
-
-%description jre-base-mozilla-plugin
-OpenJDK Java plugin for WWW browsers built using free software only.
-
-To install this plugin automatically in PLD web browsers install
-'browser-plugin-java-%{name}' package too.
-
-%description jre-base-mozilla-plugin -l pl.UTF-8
-Wtyczka dla przeglądarek oferująca wsparcie dla javy za pośrednictwem
-środowiska OpenJDK zbudowana wyłącznie przy użyciu wolnego
-oprogramowania.
-
-Aby zainstalować tę wtyczke automatycznie w przeglądarkach dostępnych
-w PLD, zainstaluj również pakiet 'browser-plugin-java-%{name}.
-
 %package jar
 Summary:	OpenJDK and GNU Classpath code - JAR tool
 Summary(pl.UTF-8):	Kod OpenJDK i GNU Classpath - narzędzie JAR
@@ -382,32 +354,14 @@
 %description examples -l pl.UTF-8
 Przykłady dla OpenJDK.
 
-%package -n browser-plugin-java-%{name}
-Summary:	IceTea Java plugin for WWW browsers
-Summary(pl.UTF-8):	Wtyczka Javy do przeglądarek WWW
-Group:		Development/Languages/Java
-Requires:	%{name}-jre-base-mozilla-plugin = %{version}-%{release}
-Requires:	browser-plugins >= 2.0
-Requires:	browser-plugins(%{_target_base_arch})
-
-%description -n browser-plugin-java-%{name}
-Java plugin for WWW browsers.
-
-%description -n browser-plugin-java-%{name} -l pl.UTF-8
-Wtyczka z obsługą Javy dla przeglądarek WWW.
-
 %prep
 %setup -q
 
 %patch0 -p1
-# rpath so IcedTeaPlugin.so can find libxul.so and libxpcom.so
-%patch1 -p1
-%patch2 -p1
 
 # patches to applied to the extracted sources
 mkdir -p pld-patches
-cp "%{PATCH3}" pld-patches
-cp "%{PATCH4}" pld-patches
+cp "%{PATCH1}" pld-patches
 
 # let the build system extract the sources where it wants them
 mkdir drops
@@ -437,17 +391,7 @@
 	--with-gcj-home=%{java_home} \
 	--with-ecj-jar=%{_javadir}/ecj.jar \
 %else
-	--with-openjdk=%{java_home} \
-%endif
-%if %{with plugin}
-	--enable-plugin \
-%else
-	--disable-plugin \
-%endif
-%if %{with webstart}
-	--enable-webstart \
-%else
-	--disable-webstart \
+	--with-jdk-home=%{java_home} \
 %endif
 	%{!?with_nss:--disable-nss} \
 	--with-xalan2-jar=%{_javadir}/xalan.jar \
@@ -472,7 +416,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{dstdir},%{_mandir}/ja,%{_browserpluginsdir}} \
+install -d $RPM_BUILD_ROOT{%{_bindir},%{dstdir},%{_mandir}/ja} \
 	$RPM_BUILD_ROOT{%{jvmjardir},%{_examplesdir}/%{name}-%{version},%{_javasrcdir}} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
@@ -517,10 +461,6 @@
 	ln -s %{_sysconfdir}/%{name}/$config $RPM_BUILD_ROOT%{jredir}/lib/$config
 done
 
-%if %{with plugin}
-ln -s %{jredir}/lib/%{jre_arch}/IcedTeaPlugin.so $RPM_BUILD_ROOT%{_browserpluginsdir}
-%endif
-
 ln -sf %{jredir}/lib/jsse.jar $RPM_BUILD_ROOT%{jvmjardir}/jsse.jar
 ln -sf %{jredir}/lib/jsse.jar $RPM_BUILD_ROOT%{jvmjardir}/jcert.jar
 ln -sf %{jredir}/lib/jsse.jar $RPM_BUILD_ROOT%{jvmjardir}/jnet.jar
@@ -533,14 +473,6 @@
 
 rm -f $RPM_BUILD_ROOT%{dstdir}/{,jre/}{ASSEMBLY_EXCEPTION,LICENSE,THIRD_PARTY_README}
 
-%post -n browser-plugin-java-%{name}
-%update_browser_plugins
-
-%postun -n browser-plugin-java-%{name}
-if [ "$1" = 0 ]; then
-	%update_browser_plugins
-fi
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -683,7 +615,6 @@
 %files jre
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/java
-%{?with_webstart:%attr(755,root,root) %{_bindir}/javaws}
 %attr(755,root,root) %{_bindir}/keytool
 %attr(755,root,root) %{_bindir}/orbd
 %attr(755,root,root) %{_bindir}/pack200
@@ -693,7 +624,6 @@
 %attr(755,root,root) %{_bindir}/tnameserv
 %attr(755,root,root) %{_bindir}/unpack200
 %{_mandir}/man1/java.1*
-%{?with_webstart:%{_mandir}/man1/javaws.1*}
 %{_mandir}/man1/keytool.1*
 %{_mandir}/man1/orbd.1*
 %{_mandir}/man1/pack200.1*
@@ -704,7 +634,6 @@
 %{_mandir}/man1/unpack200.1*
 %lang(ja) %{_mandir}/ja/man1/java.1*
 %ifnarch x86_64
-%{?with_webstart:%lang(ja) %{_mandir}/ja/man1/javaws.1*}
 %endif
 %lang(ja) %{_mandir}/ja/man1/keytool.1*
 %lang(ja) %{_mandir}/ja/man1/orbd.1*
@@ -728,10 +657,6 @@
 %dir %{dstdir}/bin
 %attr(755,root,root) %{jredir}/bin/java
 %attr(755,root,root) %{dstdir}/bin/java
-%if %{with webstart}
-%attr(755,root,root) %{jredir}/bin/javaws
-%attr(755,root,root) %{dstdir}/bin/javaws
-%endif
 %attr(755,root,root) %{jredir}/bin/keytool
 %attr(755,root,root) %{dstdir}/bin/keytool
 %attr(755,root,root) %{jredir}/bin/orbd
@@ -873,25 +798,15 @@
 %defattr(644,root,root,755)
 %{_examplesdir}/%{name}-%{version}
 
-%if %{with plugin}
-%files jre-base-mozilla-plugin
-%defattr(644,root,root,755)
-%attr(755,root,root) %{jredir}/bin/pluginappletviewer
-%attr(755,root,root) %{dstdir}/bin/pluginappletviewer
-%attr(755,root,root) %{jredir}/lib/%{jre_arch}/IcedTeaPlugin.so
-
-%files -n browser-plugin-java-%{name}
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/pluginappletviewer
-%attr(755,root,root) %{_browserpluginsdir}/IcedTeaPlugin.so
-%endif
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.84  2012/03/21 13:30:37  jajcus
+- Version: 1.11.1
+
 Revision 1.83  2012/03/21 12:12:31  jajcus
 - S: icedtea-web, instead of the plugin subpackage
 - 'bootstrap' bcond description fix
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/icedtea6/TODO?r1=1.9&r2=1.10
    http://cvs.pld-linux.org/packages/icedtea6/icedtea6.spec?r1=1.83&r2=1.84

