Changes - j0ke.net Open Build Service

Changes of Revision 20

[-] [+]	Changed	java-1_6_0-sun.spec
@@ -46,6 +46,12 @@ %define pluginpath %{_jvmdir}/%{jredir}/plugin/i386/ns7 %define pluginname libjavaplugin_oji.so %endif +%ifarch x86_64 +%define pluginsdir %{_libdir}/browser-plugins +%define pluginpath %{_jvmdir}/%{jredir}/plugin/amd64 +%define pluginname libjavaplugin_jni.so +%endif + %define cgibindir %{_var}/www/cgi-bin # Avoid RPM 4.2+'s internal dep generator, it may produce bogus # Provides/Requires here. @@ -77,7 +83,7 @@ Conflicts: kaffe ExclusiveArch: %ix86 x86_64 BuildRoot: %{_tmppath}/%{name}-%{version}-build -%ifarch %ix86 +%ifarch %ix86 \|\| x86_64 Provides: javaws = %{javaws_ver} %endif Provides: jndi = %{javaver}, jndi-ldap = %{javaver} @@ -107,7 +113,7 @@ Obsoletes: java2-jre < 1.4.2-150 Provides: java2-jre = 1.6.0 PreReq: update-alternatives -%ifarch %ix86 +%ifarch %ix86 \|\| x86_64 Obsoletes: javaws-menu %endif Provides: j2re = 1.6.0 @@ -183,7 +189,7 @@ -%ifarch %ix86 +%ifarch %ix86 \|\| x86_64 %package plugin Summary: Browser plugin files for java-1_6_0-sun @@ -309,7 +315,7 @@ # rest of the jre cp -a jre/bin jre/lib $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib -%ifarch %ix86 +%ifarch %ix86 \|\| x86_64 cp -a jre/javaws jre/plugin $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} %endif install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/endorsed @@ -330,7 +336,7 @@ ln -s %{sdkdir} %{jrelnk} ln -s %{sdkdir} %{sdklnk} popd -%ifarch %ix86 +%ifarch %ix86 \|\| x96_64 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/applications install -Dpm 644 jre/plugin/desktop/sun_java.png \ $RPM_BUILD_ROOT%{_datadir}/pixmaps/sun-java-%{version}-%{release}.png @@ -375,7 +381,7 @@ \| sed 's\|'$RPM_BUILD_ROOT'\|%dir \|' > %{name}-%{version}-all.files find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type f -o -type l \ \| sed 's\|'$RPM_BUILD_ROOT'\|\|' >> %{name}-%{version}-all.files -%ifarch %ix86 +%ifarch %ix86 \|\| x86_64 grep plugin %{name}-%{version}-all.files \| sort \ > %{name}-%{version}-plugin.files %endif @@ -401,7 +407,7 @@ %post # set link to javaws ... remove old link, as older versions had a directory as a target -%ifarch %ix86 +%ifarch %ix86 \|\| x86_64 if [ -e /usr/bin/javaws ] then rm -f /usr/bin/javaws @@ -412,7 +418,7 @@ [ -f %{_mandir}/man1/java-%{name}.1.bz2 ] && ext=".bz2" [ -f %{_mandir}/man1/java-%{name}.1.gz ] && ext=".gz" update-alternatives --install %{_bindir}/java java %{jrebindir}/java %{priority} \ -%ifarch %ix86 +%ifarch %ix86 \|\| x86_64 --slave %{_bindir}/ControlPanel ControlPanel %{jrebindir}/ControlPanel \ --slave %{_datadir}/javaws javaws %{jrebindir}/javaws \ %endif @@ -456,7 +462,7 @@ %{_jvmdir}/%{jrelnk}/lib/security/US_export_policy.jar \ jce_%{javaver}_%{origin}_us_export_policy \ %{_jvmprivdir}/%{name}/jce/vanilla/US_export_policy.jar -%ifarch %ix86 +%ifarch %ix86 \|\| x86_64 if [ -f %{_sysconfdir}/mime.types ]; then perl -p -i -e 's\|application/x-java-jnlp-file.*\|\|g' %{_sysconfdir}/mailcap.bak 2>/dev/null echo "type=application/x-java-jnlp-file; description=\"Java Web Start\"; exts=\"jnlp\"" >> %{_sysconfdir}/mailcap 2>/dev/null @@ -540,7 +546,7 @@ fi done ### bad symlinks workaround ### -%ifarch %ix86 +%ifarch %ix86 \|\| x86_64 %post plugin # set link to plugin lib @@ -585,7 +591,7 @@ %files -f %{name}-%{version}.files %defattr(-,root,root,-) -%ifarch %ix86 +%ifarch %ix86 \|\| x86_64 %{_datadir}/applications/jpackage-%{name}-webstart.desktop %{_datadir}/pixmaps/sun-java-%{version}-%{release}.png %endif @@ -600,7 +606,7 @@ %{_jvmdir}/%{jredir}/lib/security/java.security %{_jvmdir}/%{jredir}/lib/security/blacklist %{_jvmdir}/%{jredir}/lib/security/trusted.libraries -%ifarch %ix86 +%ifarch %ix86 \|\| x86_64 %{_jvmdir}/%{jredir}/lib/security/javaws.policy %endif %ghost %{_jvmdir}/%{jredir}/lib/security/local_policy.jar @@ -630,7 +636,7 @@ %files devel %defattr(-,root,root,-) -%doc COPYRIGHT LICENSE README.html +%doc COPYRIGHT README.html %dir %{_jvmdir}/%{sdkdir}/bin %dir %{_jvmdir}/%{sdkdir}/include %dir %{_jvmdir}/%{sdkdir}/lib @@ -682,7 +688,7 @@ %files jdbc -f %{name}-%{version}-jdbc.files %defattr(-,root,root,-) -%ifarch %ix86 +%ifarch %ix86 \|\| x86_64 %files plugin -f %{name}-%{version}-plugin.files %defattr(-,root,root,-)