Author: peroyvind
Date: Tue Feb 13 19:40:22 2007
New Revision: 120625
Modified:
packages/cooker/java-1.5.0-sun/current/SPECS/java-1.5.0-sun.spec
Log:
add back conflicts on kaffe that magically disappaered
fix plugin location and use update-alternatives to handle several versions..
Modified: packages/cooker/java-1.5.0-sun/current/SPECS/java-1.5.0-sun.spec
==============================================================================
--- packages/cooker/java-1.5.0-sun/current/SPECS/java-1.5.0-sun.spec
(original)
+++ packages/cooker/java-1.5.0-sun/current/SPECS/java-1.5.0-sun.spec Tue Feb
13 19:40:22 2007
@@ -56,6 +56,7 @@
Provides: java = %{javaver}
Requires: update-alternatives
Requires: jpackage-utils >= 0:1.5.38
+Conflicts: kaffe
BuildArch: i586 x86_64
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: jpackage-utils >= 0:1.5.38 sed lzma
@@ -301,12 +302,6 @@
# These %ghost'd files are created properly in %post -- Rex
touch
%{buildroot}%{fontdir}/{fonts.{alias,scale,cache-1},XftCache,encodings.dir}
-%ifnarch x86_64
-install -d %{buildroot}%{_libdir}/mozilla-firefox/plugins
-mv %{buildroot}%{pluginname} %{buildroot}%{_libdir}/mozilla-firefox/plugins/
-ln -s %{_libdir}/mozilla-firefox/plugins/libjavaplugin_oji.so
%{buildroot}%{pluginname}
-%endif
-
cd ..
# Most of this shamelessly stolen from redhat's kdebase-2.2.2 specfile
@@ -365,6 +360,7 @@
%ifnarch x86_64
--slave %{_bindir}/ControlPanel ControlPanel
%{jrebindir}/ControlPanel \
--slave %{_datadir}/javaws javaws
%{jrebindir}/javaws \
+--slave %{_libdir}/mozilla-firefox/plugins/libjavaplugin_oji.so
libjavaplugin_oji.so
%{_jvmdir}/%{jredir}/plugin/i386/ns7/libjavaplugin_oji.so \
%endif
%{expand:%(for bin in %{jrebin}; do echo \
--slave %{_bindir}/${bin} ${bin}
%{jrebindir}/${bin} \\; done ; for man in %{jreman}; do echo \
@@ -489,7 +485,6 @@
%ifnarch x86_64
%files plugin -f %{name}-%{version}-plugin.files
%defattr(-,root,root,-)
-%{_libdir}/mozilla-firefox/plugins/*so
%endif
%files fonts
