rpms/icedtea-web
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix java installation dir (add -%{_arch}) [release 1.6-3mamba;Tue Jul 28 2015]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-05 23:49:04 +01:00
parent 35a42735b5
commit 497324f36e
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
icedtea-web.spec
View File

@ -1,18 +1,24 @@
%define origin openjdk %define origin openjdk
%define buildver 0 %define buildver 0
%define javaver 7 %define javaver 7
%define jppname java-%{javaver}-%{origin} %define jppname java-%{javaver}-%{origin}-%{_arch}
%define sdkdir %{jppname} %define sdkdir %{jppname}
%define jredir %{jppname}/jre %define jredir %{jppname}/jre
%define jrelnk jre-%{javaver}-%{origin} %define jrelnk jre-%{javaver}-%{origin}
%define jrebindir %{_jvmdir}/%{jredir}/bin %define jrebindir %{_jvmdir}/%{jredir}/bin
%define installdir %{_jvmdir}/%{jppname} %define installdir %{_jvmdir}/%{jppname}
%define archbuild %{_target_cpu}
%ifarch %{ix86}
%define archbuild i386 %define archbuild i386
%endif
%ifarch x86_64
%define archbuild amd64
%endif
Name: icedtea-web Name: icedtea-web
Version: 1.6 Version: 1.6
Release: 2mamba Release: 3mamba
Summary: IcedTea Web Start implementation Summary: IcedTea Web Start implementation
Group: System/Libraries/Java Group: System/Libraries/Java
Vendor: openmamba Vendor: openmamba
@ -127,6 +133,13 @@ fi
exit 0 exit 0
%post %post
if [ $1 -ge 1 ]; then
# Fix for directory which should be a symlink
[ -L %{_jvmdir}/java-%{javaver}-%{origin} ] || {
mv %{_jvmdir}/java-%{javaver}-%{origin} %{_jvmdir}/java-%{javaver}-%{origin}.bak
ln -sf %{jppname} %{_jvmdir}/java-%{javaver}-%{origin}
}
fi
[ -L /usr/bin/javaws -a "`readlink /usr/bin/javaws`" != "/etc/alternatives/javaws" ] && [ -L /usr/bin/javaws -a "`readlink /usr/bin/javaws`" != "/etc/alternatives/javaws" ] &&
rm -f /usr/bin/javaws 2>/dev/null rm -f /usr/bin/javaws 2>/dev/null
@ -210,19 +223,13 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%{_jvmdir}/%{sdkdir}/bin/itweb-settings %{_jvmdir}/%{sdkdir}/bin/itweb-settings
%{_jvmdir}/%{sdkdir}/bin/javaws %{_jvmdir}/%{sdkdir}/bin/javaws
#%{_jvmdir}/%{sdkdir}/bin/pluginappletviewer
%{jrebindir}/itweb-settings %{jrebindir}/itweb-settings
%{jrebindir}/javaws %{jrebindir}/javaws
%dir %{_datadir}/icedtea-web %dir %{_datadir}/icedtea-web
%{_datadir}/icedtea-web/* %{_datadir}/icedtea-web/*
#%{_jvmdir}/%{jredir}/lib/about.jar %{_jvmdir}/%{sdkdir}/bin/policyeditor
#%{_jvmdir}/%{jredir}/lib/about.jnlp
#%{_jvmdir}/%{jredir}/lib/netx.jar
#%{_jvmdir}/%{jredir}/lib/plugin.jar
%{_jvmdir}/java-%{javaver}-openjdk/bin/policyeditor
%{_datadir}/applications/itweb-settings.desktop %{_datadir}/applications/itweb-settings.desktop
%{_datadir}/applications/javaws.desktop %{_datadir}/applications/javaws.desktop
#%{_datadir}/icons/hicolor/*x*/apps/javaws.png
%{_datadir}/pixmaps/javaws.png %{_datadir}/pixmaps/javaws.png
%{_mandir}/man1/icedtea-web-plugin.1.gz %{_mandir}/man1/icedtea-web-plugin.1.gz
%{_mandir}/man1/icedtea-web.1.gz %{_mandir}/man1/icedtea-web.1.gz
@ -233,19 +240,21 @@ fi
%lang(de) %{_mandir}/de/man1/*.1* %lang(de) %{_mandir}/de/man1/*.1*
%lang(pl) %{_mandir}/pl/man1/*.1* %lang(pl) %{_mandir}/pl/man1/*.1*
%doc AUTHORS COPYING %doc AUTHORS COPYING
#%doc ChangeLog NEWS README plugin/docs
%files plugin %files plugin
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_libdir}/mozilla/plugins %dir %{_libdir}/mozilla/plugins
%{_libdir}/mozilla/plugins/IcedTeaPlugin.so %{_libdir}/mozilla/plugins/IcedTeaPlugin.so
%{_jvmdir}/java-%{javaver}-openjdk/lib/IcedTeaPlugin.so %{_jvmdir}/%{sdkdir}/lib/IcedTeaPlugin.so
%files javadoc %files javadoc
%defattr(-,root,root) %defattr(-,root,root)
%{_javadocdir}/icedtea-web %{_javadocdir}/icedtea-web
%changelog %changelog
* Tue Jul 28 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.6-3mamba
- fix java installation dir (add -%{_arch})
* Sun Jul 26 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.6-2mamba * Sun Jul 26 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.6-2mamba
- plugin: remove requirement for java-openjdk-runtime = 7 - plugin: remove requirement for java-openjdk-runtime = 7