rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.49, 1.50 java-1.4.2-gcj-compat.spec, 1.156, 1.157 sources, 1.55, 1.56
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jul 21 10:27:46 UTC 2006
Author: fitzsim
Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30899
Modified Files:
.cvsignore java-1.4.2-gcj-compat.spec sources
Log Message:
* Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_94rh
- Add plugin subpackage.
- Install libjawt.so and libjvm.so symlinks.
- Install appletviewer, jarsigner and keytool symlinks.
- Import java-gcj-compat 1.0.60.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore 20 Jun 2006 21:44:09 -0000 1.49
+++ .cvsignore 21 Jul 2006 10:27:43 -0000 1.50
@@ -1,5 +1,3 @@
-java-gcj-compat-1.0.52.tar.gz
-bcprov-jdk14-131.tar.gz
+java-gcj-compat-1.0.60.tar.gz
ecj.sh.in
eclipse-ecj-3.1.0_fc-12.jar
-java-gcj-compat-static-compile.patch
Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- java-1.4.2-gcj-compat.spec 21 Jul 2006 07:16:37 -0000 1.156
+++ java-1.4.2-gcj-compat.spec 21 Jul 2006 10:27:43 -0000 1.157
@@ -11,11 +11,11 @@
%define buildver 0
# the version-release string for the gcj rpms we require
%define gccver 4.0.0-0.42
-%define jgcver 1.0.59
+%define jgcver 1.0.60
%define name java-%{javaver}-%{origin}-compat
%define version %{javaver}.%{buildver}
-%define release 40jpp_93rh
+%define release 40jpp_94rh
%define cname java-%{javaver}-%{origin}
%define sdklnk java-%{javaver}-%{origin}
@@ -26,6 +26,8 @@
%define jrebindir %{_jvmdir}/%{jrelnk}/bin
%define jvmjardir %{_jvmjardir}/%{cname}-%{version}
+%define plugindir %{_libdir}/mozilla/plugins
+
Name: %{name}
Version: %{version}
Release: %{release}
@@ -65,10 +67,6 @@
Provides: jce
Obsoletes: java-1.4.2-gcj4-compat <= 1.4.2.0-4jpp_2rh
PreReq: chkconfig
-%if %{custom}
-# prevent autogeneration of libjawt.so dependencies
-AutoReqProv: no
-%endif
%description
This package installs directory structures, shell scripts and symbolic
@@ -117,6 +115,19 @@
%description javadoc
This package installs Javadoc API documentation for libgcj.
+%package plugin
+Summary: Web browser plugin that handles applets
+Group: Applications/Internet
+Provides: java-plugin = %{javaver}, java-%{javaver}-plugin = %{version}
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{_sbindir}/update-alternatives
+Requires(post): %{_sbindir}/update-alternatives
+Requires(postun): %{_sbindir}/update-alternatives
+Requires: %{plugindir}
+
+%description plugin
+This package installs gcjwebplugin, a Mozilla plugin for applets.
+
%prep
%setup -q -n java-gcj-compat-%{jgcver}
@@ -241,10 +252,14 @@
popd
%ifarch x86_64
-ln -s %{_jvmdir}/%{jredir}/lib/%{_arch} \
+ln -sf %{_jvmdir}/%{jredir}/lib/%{_arch} \
$RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/amd64
%endif
+# install libjvm.so directories
+mkdir -p $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/%{_arch}/client
+mkdir -p $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/%{_arch}/server
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -258,6 +273,7 @@
--install %{_bindir}/java java %{jrebindir}/java %{priority} \
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{jrelnk} \
--slave %{_jvmjardir}/jre jre_exports %{_jvmjardir}/%{jrelnk} \
+ --slave %{_bindir}/keytool keytool %{jrebindir}/keytool \
--slave %{_bindir}/rmiregistry rmiregistry %{jrebindir}/rmiregistry
update-alternatives \
@@ -318,6 +334,17 @@
then
%{_bindir}/rebuild-gcj-db
fi
+{
+ # libjawt.so
+ ln -sf %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libjawt.so \
+ %{_jvmdir}/%{jredir}/lib/%{_arch}/libjawt.so
+
+ # libjvm.so
+ ln -sf %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libjvm.so \
+ %{_jvmdir}/%{jredir}/lib/%{_arch}/client/libjvm.so
+ ln -sf %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libjvm.so \
+ %{_jvmdir}/%{jredir}/lib/%{_arch}/server/libjvm.so
+} || :
%post devel
@@ -332,6 +359,8 @@
--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}/rmic rmic %{sdkbindir}/rmic
update-alternatives \
@@ -384,6 +413,11 @@
ln -sf %{name}-%{version} %{_javadocdir}/java
} || :
+%post plugin
+
+ update-alternatives --install %{plugindir}/libjavaplugin.so \
+ libjavaplugin.so %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libgcjwebplugin.so %{priority}
+
%postun
if [ $1 -eq 0 ] ; then
@@ -425,6 +459,11 @@
update-alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk}
fi
+%postun plugin
+if [ $1 -eq 0 ] ; then
+ update-alternatives --remove libjavaplugin.so %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libgcjwebplugin.so
+fi
+
%triggerin -- libgcj%{gccsuffix} > %{gccver}
{
@@ -463,6 +502,17 @@
jaxp_parser_impl \
%{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar 20
%endif
+
+ # libjawt.so
+ ln -sf %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libjawt.so \
+ %{_jvmdir}/%{jredir}/lib/%{_arch}/libjawt.so
+
+ # libjvm.so
+ ln -sf %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libjvm.so \
+ %{_jvmdir}/%{jredir}/lib/%{_arch}/client/libjvm.so
+ ln -sf %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libjvm.so \
+ %{_jvmdir}/%{jredir}/lib/%{_arch}/server/libjvm.so
+
} || :
# gcc-java requires libgcj-devel which provides jni.h
@@ -506,6 +556,18 @@
%{_jvmdir}/%{cname}-%{version}/src.zip
} || :
+%triggerin plugin -- libgcj%{gccsuffix} > %{gccver}
+{
+
+%if %{custom}
+export PATH=%{gcj_prefix}/bin:$PATH
+%endif
+
+ # plugin
+ update-alternatives --install %{plugindir}/libjavaplugin.so \
+ libjavaplugin.so %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libgcjwebplugin.so %{priority}
+} || :
+
%files -f %{name}-%{version}.files
%defattr(-,root,root,-)
%dir %{_libdir}/gcj
@@ -528,6 +590,8 @@
%ifarch x86_64
%{_jvmdir}/%{jredir}/lib/amd64
%endif
+%{_jvmdir}/%{jredir}/lib/%{_arch}/client
+%{_jvmdir}/%{jredir}/lib/%{_arch}/server
%files devel -f %{name}-%{version}-sdk-bin.files
%defattr(-,root,root)
@@ -554,7 +618,16 @@
%ghost %doc %{_javadocdir}/%{name}
%ghost %doc %{_javadocdir}/java
+%files plugin
+%defattr(-,root,root)
+
%changelog
+* Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_94rh
+- Add plugin subpackage.
+- Install libjawt.so and libjvm.so symlinks.
+- Install appletviewer, jarsigner and keytool symlinks.
+- Import java-gcj-compat 1.0.60.
+
* Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_93rh
- Import java-gcj-compat 1.0.59.
- Use standard BuildRoot tag.
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources 21 Jul 2006 07:16:37 -0000 1.55
+++ sources 21 Jul 2006 10:27:43 -0000 1.56
@@ -1,3 +1,3 @@
-40635fcbe7183ce72fdd45b8a3fc373e java-gcj-compat-1.0.52.tar.gz
+ab3bbc4c6346f2e3a6a76a894fd79083 java-gcj-compat-1.0.60.tar.gz
e9c12c59e5a34c5c916d3b032dd7855e ecj.sh.in
95766e40c6ab6b641341f3a44dcf0b9e eclipse-ecj-3.1.0_fc-12.jar
More information about the fedora-cvs-commits
mailing list