# HG changeset patch # User Thomas Fitzsimmons # Date 1187642473 14400 # Node ID 38de0738215251d4f308a1abc5eb27e1067124a8 # Parent efae3542eaa62eb94efb87a07f55279b62bf4c82 * Mon Aug 20 2007 Thomas Fitzsimmons - 1.7.0.0-0.11.b18.snapshot - Add missing development alternatives. - Bump accessver to 1.19.2. - Bump icedteaver. - Set icedteasnapshot. - Define icedtearelease. - Bump openjdkver. - Bump openjdkdate. - Bump release number. - Add plugin build requirements and subpackage. diff -r efae3542eaa6 -r 38de07382152 README --- a/README Wed Aug 01 14:35:35 2007 -0400 +++ b/README Mon Aug 20 16:41:13 2007 -0400 @@ -8,7 +8,8 @@ 3. Copy/symlink openjdk-7-ea-src-b16-20_jul_2007.zip into this directory. 4. Copy/symlink java-access-bridge-1.18.0.tar.gz into this directory. 5. Define icedteasnapshot to -$snapshot in spec file. -6. Comment out NoSource line in spec file. +6. Define icedtearelease to snapshot in the spec file. +7. Comment out NoSource line in spec file. IcedTea full release: @@ -17,7 +18,8 @@ 3. Copy/symlink openjdk-7-ea-src-b16-20_jul_2007.zip into this directory. 4. Copy/symlink java-access-bridge-1.18.0.tar.gz into this directory. 5. Define icedteasnapshot to %{nil} in spec file. -6. Comment out NoSource line in spec file. +6. Define icedtearelease to %{icedteaver} in the spec file. +7. Comment out NoSource line in spec file. To build binary rpms, do: diff -r efae3542eaa6 -r 38de07382152 java-1.7.0-icedtea.spec --- a/java-1.7.0-icedtea.spec Wed Aug 01 14:35:35 2007 -0400 +++ b/java-1.7.0-icedtea.spec Mon Aug 20 16:41:13 2007 -0400 @@ -4,12 +4,13 @@ # is not supported yet. %define gcjbootstrap 1 -%define icedteaver 1.2 -%define icedteasnapshot %{nil} -%define openjdkver b16 -%define openjdkdate 20_jul_2007 +%define icedteaver 1.3 +%define icedteasnapshot -2cef0ff1e2f7b67dbad0c69ad9d3a557c83dc4b7 +%define icedtearelease snapshot +%define openjdkver b18 +%define openjdkdate 16_aug_2007 -%define accessver 1.18.0 +%define accessver 1.19.2 %define openjdkurlbase http://www.java.net/download/openjdk/jdk7/promoted/ %define openjdkurl %{openjdkurlbase}%{openjdkver}/ @@ -17,18 +18,18 @@ %ifarch x86_64 %define archbuild amd64 +%define archinstall amd64 %else %define archbuild i586 +%define archinstall i386 %endif %define buildoutputdir openjdk/control/build/linux-%{archbuild} %if %{gcjbootstrap} %define icedteaopt %{nil} -%define icedteatarget bootstrap %else %define icedteaopt --with-icedtea -%define icedteatarget %{nil} %endif # Convert an absolute path to a relative path. Each symbolic link is @@ -85,7 +86,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: 0.10.%{openjdkver}.%{icedteaver}%{?dist} +Release: 0.11.%{openjdkver}.%{icedtearelease}%{?dist} Summary: IcedTea Runtime Environment Group: Development/Languages @@ -125,6 +126,10 @@ BuildRequires: xorg-x11-utils # Certificate file generation requirements. BuildRequires: openssl +# gcjwebplugin build requirements. +BuildRequires: firefox-devel +BuildRequires: glib2-devel +BuildRequires: gtk2-devel # Post requires alternatives to install tool alternatives. Requires(post): %{_sbindir}/alternatives @@ -208,12 +213,17 @@ Summary: IcedTea API Documentation Group: Documentation +# Post requires alternatives to install javadoc alternative. +Requires(post): %{_sbindir}/alternatives +# Postun requires alternatives to uninstall javadoc alternative. +Requires(postun): %{_sbindir}/alternatives + # Standard JPackage javadoc provides. Provides: java-javadoc = %{version}-%{release} Provides: java-%{javaver}-javadoc = %{version}-%{release} %description javadoc -The IcedTea API Documentation. +The IcedTea API documentation. %ifnarch x86_64 %package rmi @@ -224,16 +234,34 @@ Requires: %{cgibindir} %description rmi -The IcedTea RMI CGI Script. +The IcedTea RMI CGI script. %endif +%package plugin +Summary: IcedTea Plugin +Group: Applications/Internet + +Requires: %{name} = %{version}-%{release} +Requires: %{_libdir}/mozilla/plugins +# Post requires alternatives to install plugin alternative. +Requires(post): %{_sbindir}/alternatives +# Postun requires alternatives to uninstall plugin alternative. +Requires(postun): %{_sbindir}/alternatives + +# Standard JPackage plugin provides. +Provides: java-plugin = %{javaver} +Provides: java-%{javaver}-plugin = %{epoch}:%{version} + +%description plugin +The IcedTea web browser plugin. + %prep %setup -q -n icedtea-%{icedteaver} gzip -dc %{SOURCE2} | tar -xf - %build ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} -make %{icedteatarget} +make pushd java-access-bridge-%{accessver} export JAVA_HOME=$(pwd)/../%{buildoutputdir}/j2sdk-image export PATH=$JAVA_HOME/bin:$PATH @@ -346,6 +374,7 @@ # Find JRE files. find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type f -o -type l \ | grep -v jre/lib/security \ + | grep -v gcjwebplugin.so \ | sed 's|'$RPM_BUILD_ROOT'||' \ >> %{name}.files # Find demo directories. @@ -463,12 +492,34 @@ --install %{_bindir}/javac javac %{sdkbindir}/javac %{priority} \ --slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdklnk} \ --slave %{_jvmjardir}/java java_sdk_exports %{_jvmjardir}/%{sdklnk} \ + --slave %{_bindir}/appletviewer appletviewer %{sdkbindir}/appletviewer \ + --slave %{_bindir}/apt apt %{sdkbindir}/apt \ + --slave %{_bindir}/extcheck extcheck %{sdkbindir}/extcheck \ + --slave %{_bindir}/idlj idlj %{sdkbindir}/idlj \ + --slave %{_bindir}/jar jar %{sdkbindir}/jar \ + --slave %{_bindir}/jarsigner jarsigner %{sdkbindir}/jarsigner \ --slave %{_bindir}/javadoc javadoc %{sdkbindir}/javadoc \ --slave %{_bindir}/javah javah %{sdkbindir}/javah \ - --slave %{_bindir}/jar jar %{sdkbindir}/jar \ - --slave %{_bindir}/jarsigner jarsigner %{sdkbindir}/jarsigner \ - --slave %{_bindir}/appletviewer appletviewer %{sdkbindir}/appletviewer \ + --slave %{_bindir}/javap javap %{sdkbindir}/javap \ + --slave %{_bindir}/java-rmi.cgi java-rmi.cgi %{sdkbindir}/java-rmi.cgi \ + --slave %{_bindir}/jconsole jconsole %{sdkbindir}/jconsole \ + --slave %{_bindir}/jdb jdb %{sdkbindir}/jdb \ + --slave %{_bindir}/jhat jhat %{sdkbindir}/jhat \ + --slave %{_bindir}/jinfo jinfo %{sdkbindir}/jinfo \ + --slave %{_bindir}/jmap jmap %{sdkbindir}/jmap \ + --slave %{_bindir}/jps jps %{sdkbindir}/jps \ + --slave %{_bindir}/jrunscript jrunscript %{sdkbindir}/jrunscript \ + --slave %{_bindir}/jsadebugd jsadebugd %{sdkbindir}/jsadebugd \ + --slave %{_bindir}/jstack jstack %{sdkbindir}/jstack \ + --slave %{_bindir}/jstat jstat %{sdkbindir}/jstat \ + --slave %{_bindir}/jstatd jstatd %{sdkbindir}/jstatd \ + --slave %{_bindir}/native2ascii native2ascii %{sdkbindir}/native2ascii \ --slave %{_bindir}/rmic rmic %{sdkbindir}/rmic \ + --slave %{_bindir}/schemagen schemagen %{sdkbindir}/schemagen \ + --slave %{_bindir}/serialver serialver %{sdkbindir}/serialver \ + --slave %{_bindir}/wsgen wsgen %{sdkbindir}/wsgen \ + --slave %{_bindir}/wsimport wsimport %{sdkbindir}/wsimport \ + --slave %{_bindir}/xjc xjc %{sdkbindir}/xjc \ --slave %{_mandir}/man1/appletviewer.1$ext appletviewer.1$ext \ %{_mandir}/man1/appletviewer-%{name}.1$ext \ --slave %{_mandir}/man1/apt.1$ext apt.1$ext \ @@ -556,6 +607,18 @@ alternatives --remove javadoc %{_javadocdir}/%{name}/api fi +%post plugin +alternatives \ + --install %{_libdir}/mozilla/plugins/libjavaplugin.so libjavaplugin.so \ + %{priority} %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so + +%postun plugin +if [ $1 -eq 0 ] +then + alternatives --remove libjavaplugin.so \ + %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so +fi + %files -f %{name}.files %defattr(-,root,root,-) %doc %{buildoutputdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION @@ -644,7 +707,22 @@ %{cgibindir}/java-rmi-%{name}.cgi %endif +%files plugin +%defattr(-,root,root,-) +%{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so + %changelog +* Mon Aug 20 2007 Thomas Fitzsimmons - 1.7.0.0-0.11.b18.snapshot +- Add missing development alternatives. +- Bump accessver to 1.19.2. +- Bump icedteaver. +- Set icedteasnapshot. +- Define icedtearelease. +- Bump openjdkver. +- Bump openjdkdate. +- Bump release number. +- Add plugin build requirements and subpackage. + * Tue Jul 31 2007 Lillian Angel - 1.7.0.0-0.10.b16.1.2 - Bump icedteaver. - Updated icedteasnapshot.