Author: peroyvind
Date: Wed Feb 14 16:23:04 2007
New Revision: 120950
Modified:
packages/cooker/java-1.5.0-sun/current/SPECS/java-1.5.0-sun.spec
Log:
fix so that 1.5.0 & 1.6.0 can live happily together :)
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 Wed Feb
14 16:23:04 2007
@@ -163,7 +163,7 @@
Summary: JDBC/ODBC bridge driver for %{name}
Group: Development/Java
Requires: %{name} = %{version}-%{release}
-%define _requires_exceptions libodbc*
+AutoReq: 0
%description jdbc
This package contains the JDBC/ODBC bridge driver for %{name}.
@@ -195,7 +195,7 @@
-e "s#/@[EMAIL PROTECTED]" \
-e "s#Icon=.*#Icon=%{name}.png#g" \
-e "[EMAIL PROTECTED]@##g" \
- > `echo $xdgmenu|cut -d- -f2|cut -d. -f1-2`
+ > %{name}-`echo $xdgmenu|cut -d- -f2|cut -d. -f1-2`
done
sed -i -e "s#PATH=/usr/local/java/bin#PATH=%{jrebindir}#"
%{jdkbundle}/bin/java-rmi.cgi
@@ -294,13 +294,13 @@
ln -s %{_datadir}/%{name}/demo %{buildroot}%{_jvmdir}
### font handling
-install -d %{buildroot}%{_datadir}/fonts
-mv %{buildroot}%{_jvmdir}/%{jredir}/lib/fonts %{buildroot}%{fontdir}
-ln -s %{fontdir} %{buildroot}%{_jvmdir}/%{jredir}/lib/fonts
+install -d %{buildroot}%{fontdir}
+#mv %{buildroot}%{_jvmdir}/%{jredir}/lib/fonts %{buildroot}%{fontdir}
+#ln -s %{fontdir} %{buildroot}%{_jvmdir}/%{jredir}/lib/fonts
ln -s %{_sysconfdir}/java/font.properties %{buildroot}%{_jvmdir}/%{jredir}/lib
# These %ghost'd files are created properly in %post -- Rex
-touch
%{buildroot}%{fontdir}/{fonts.{alias,scale,cache-1},XftCache,encodings.dir}
+touch
%{buildroot}%{fontdir}/{fonts.{alias,dir,scale,cache-1},XftCache,encodings.dir}
cd ..
# Most of this shamelessly stolen from redhat's kdebase-2.2.2 specfile
@@ -356,16 +356,14 @@
rm -rf %{buildroot}
%post
-update-alternatives --install %{_bindir}/java java %{jrebindir}/java
%{priority} \
+update-alternatives --install %{_bindir}/java java %{jrebindir}/java
%{priority}%{expand:%(for bin in %{jrebin}; do echo -n -e \ \\\\\\n\
+--slave %{_bindir}/${bin} ${bin}
%{sdkbindir}/${bin}; done)}%{expand:%(for man in %{jreman}; do echo -n -e \
\\\\\\n\
+--slave %{_mandir}/man1/${man}.1%{_extension} ${man}.1%{_extension}
%{_mandir}/man1/${man}-%{name}.1%{_extension}; done)}%{expand:%(for man in
%{jreman}; do echo -n -e \ \\\\\\n\
+--slave %{_mandir}/ja_JP.eucJP/man1/${man}.1%{_extension}
${man}%{_extension}.ja_JP.eucJP
%{_mandir}/ja_JP.eucJP/man1/${man}-%{name}.1%{_extension}; done)} \
%ifnarch x86_64
--slave %{_bindir}/ControlPanel ControlPanel
%{jrebindir}/ControlPanel \
--slave %{_datadir}/javaws javaws
%{jrebindir}/javaws \
---slave %{_libdir}/mozilla/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 \
---slave %{_mandir}/man1/${man}.1%{_extension} ${man}.1%{_extension}
%{_mandir}/man1/${man}-%{name}.1%{_extension} \\; echo \
---slave %{_mandir}/ja_JP.eucJP/man1/${man}.1%{_extension}
${man}.1%{_extension}.ja_JP.eucJP
%{_mandir}/ja_JP.eucJP/man1/${man}-%{name}.1%{_extension} \\; done)}
--slave %{_jvmdir}/jre jre
%{_jvmdir}/%{jrelnk} \
--slave %{_jvmjardir}/jre jre_exports
%{_jvmjardir}/%{jrelnk}
@@ -386,11 +384,10 @@
%{_jvmprivdir}/%{name}/jce/vanilla/US_export_policy.jar
%post devel
-update-alternatives --install %{_bindir}/javac javac %{sdkbindir}/javac
%{priority} \
-%{expand:%(for bin in %{jdkbin}; do echo \
---slave %{_bindir}/${bin} ${bin}
%{sdkbindir}/${bin} \\; done ; for man in %{jdkman}; do echo \
---slave %{_mandir}/man1/${man}.1%{_extension} ${man}.1%{_extension}
%{_mandir}/man1/${man}-%{name}.1%{_extension} \\; echo \
---slave %{_mandir}/ja_JP.eucJP/man1/${man}.1%{_extension}
${man}%{_extension}.ja_JP.eucJP
%{_mandir}/ja_JP.eucJP/man1/${man}-%{name}.1%{_extension} \\; done)}
+update-alternatives --install %{_bindir}/javac javac %{jrebindir}/javac
%{priority}%{expand:%(for bin in %{jdkbin}; do echo -n -e \ \\\\\\n\
+--slave %{_bindir}/${bin} ${bin}
%{sdkbindir}/${bin}; done)}%{expand:%(for man in %{jdkman}; do echo -n -e \
\\\\\\n\
+--slave %{_mandir}/man1/${man}.1%{_extension} ${man}.1%{_extension}
%{_mandir}/man1/${man}-%{name}.1%{_extension}; done)}%{expand:%(for man in
%{jdkman}; do echo -n -e \ \\\\\\n\
+--slave %{_mandir}/ja_JP.eucJP/man1/${man}.1%{_extension}
${man}%{_extension}.ja_JP.eucJP
%{_mandir}/ja_JP.eucJP/man1/${man}-%{name}.1%{_extension}; done)} \
--slave %{_jvmdir}/java java_sdk
%{_jvmdir}/%{sdklnk} \
--slave %{_jvmjardir}/java java_sdk_exports
%{_jvmjardir}/%{sdklnk}
@@ -400,6 +397,9 @@
update-alternatives --install %{_jvmdir}/java-%{javaver} java_sdk_%{javaver}
%{_jvmdir}/%{sdklnk} %{priority} \
--slave %{_jvmjardir}/java-%{javaver} java_sdk_%{javaver}_exports
%{_jvmjardir}/%{sdklnk}
+%post plugin
+update-alternatives --install %{_libdir}/mozilla/plugins/libjavaplugin_oji.so
libjavaplugin_oji.so %{pluginname} %{priority}
+
%postun
update-alternatives --remove java %{jrebindir}/java
update-alternatives --remove \
@@ -413,11 +413,22 @@
update-alternatives --remove java_sdk_%{origin} %{_jvmdir}/%{sdklnk}
update-alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk}
+%postun plugin
+update-alternatives --remove libjavaplugin_oji.so
+
%post fonts
+%define fonts LucidaBrightItalic.ttf LucidaSansDemiBold.ttf
LucidaTypewriterBold.ttf LucidaBrightDemiItalic.ttf LucidaBrightRegular.ttf
LucidaSansRegular.ttf LucidaTypewriterRegular.ttf
+
+update-alternatives --install %{fontdir}/LucidaBrightDemiBold.ttf
LucidaBrightDemiBold.ttf
%{_jvmdir}/%{jredir}/lib/fonts/LucidaBrightDemiBold.ttf %{priority} \
+%{expand:%(for font in %{fonts}; do echo -n -e \ \\\\\\n\
+--slave %{fontdir}/$font $font %{_jvmdir}/%{jredir}/lib/fonts/$font;
done)}
+
mkfontscale %{fontdir}
mkfontdir %{fontdir}
%postun fonts
+update-alternatives --remove LucidaBrightDemiBold.ttf
%{_jvmdir}/%{jredir}/lib/fonts/LucidaBrightDemiBold.ttf
+
if [ -d %{fontdir} ]; then
mkfontscale %{fontdir}
mkfontdir %{fontdir}
@@ -489,8 +500,8 @@
%files fonts
%defattr(0644,root,root,0755)
+%{_jvmdir}/%{jredir}/lib/fonts/*.ttf
%dir %{fontdir}
-%{fontdir}/*.ttf
%config(noreplace) %{fontdir}/fonts.alias
%ghost %{fontdir}/fonts.dir
%ghost %{fontdir}/fonts.scale
