[java-1.6.0-openjdk/f15/master] Removed plugin
jiri vanek
jvanek at fedoraproject.org
Thu Mar 17 08:16:35 UTC 2011
commit 162b81262dc0b0aad25aef07f85dfb10aa51fa8c
Author: Jiri Vanek <jvanek at dhcp-2-137.brq.redhat.com>
Date: Thu Mar 17 09:11:53 2011 +0100
Removed plugin
java-1.6.0-openjdk.spec | 73 -----------------------------------------------
1 files changed, 0 insertions(+), 73 deletions(-)
---
diff --git a/java-1.6.0-openjdk.spec b/java-1.6.0-openjdk.spec
index 955269c..2123ab0 100644
--- a/java-1.6.0-openjdk.spec
+++ b/java-1.6.0-openjdk.spec
@@ -90,11 +90,9 @@
%define syslibdir %{_prefix}/lib64
%define _libdir %{_prefix}/lib
%define archname %{name}.%{_arch}
-%define javaplugin libjavaplugin.so.%{_arch}
%else
%define syslibdir %{_libdir}
%define archname %{name}
-%define javaplugin libjavaplugin.so
%endif
# Standard JPackage naming and versioning defines.
@@ -218,11 +216,6 @@ BuildRequires: gawk
BuildRequires: libbonobo-devel
BuildRequires: pkgconfig >= 0.9.0
BuildRequires: xorg-x11-utils
-# IcedTeaPlugin build requirements.
-BuildRequires: gecko-devel
-BuildRequires: glib2-devel
-BuildRequires: gtk2-devel
-BuildRequires: xulrunner-devel
# PulseAudio build requirements.
BuildRequires: pulseaudio-libs-devel >= 0.9.11
BuildRequires: pulseaudio >= 0.9.11
@@ -357,27 +350,6 @@ Provides: java-%{javaver}-javadoc = %{epoch}:%{version}-%{release}
%description javadoc
The OpenJDK API documentation.
-%package plugin
-Summary: OpenJDK Web Browser Plugin
-Group: Applications/Internet
-
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: mozilla-filesystem%{?_isa}
-# Post requires alternatives to install plugin alternative.
-Requires(post): %{_sbindir}/alternatives
-# Postun requires alternatives to uninstall plugin alternative.
-Requires(postun): %{_sbindir}/alternatives
-
-# java-1.6.0-openjdk-plugin replaces java-1.7.0-icedtea-plugin.
-Provides: java-1.7.0-icedtea-plugin = 0:1.7.0.0-0.999
-Obsoletes: java-1.7.0-icedtea-plugin < 0:1.7.0.0-0.999
-
-# Standard JPackage plugin provides.
-Provides: java-plugin = %{javaver}
-Provides: java-%{javaver}-plugin = %{epoch}:%{version}
-
-%description plugin
-The OpenJDK web browser plugin.
%prep
%setup -q -n icedtea6-%{icedteaver}
@@ -559,9 +531,6 @@ done
# Install desktop files.
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps}
-cp javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
-desktop-file-install --vendor ''\
- --dir $RPM_BUILD_ROOT%{_datadir}/applications javaws.desktop
for e in jconsole policytool ; do
desktop-file-install --vendor=fedora --mode=644 \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop
@@ -575,7 +544,6 @@ find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \
# Find JRE files.
find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type f -o -type l \
| grep -v jre/lib/security \
- | grep -v IcedTeaPlugin.so \
| sed 's|'$RPM_BUILD_ROOT'||' \
>> %{name}.files
# Find demo directories.
@@ -614,7 +582,6 @@ alternatives \
--install %{_bindir}/java java %{jrebindir}/java %{priority} \
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{jrelnk} \
--slave %{_jvmjardir}/jre jre_exports %{_jvmjardir}/%{jrelnk} \
- --slave %{_bindir}/javaws javaws %{jrebindir}/javaws \
--slave %{_bindir}/keytool keytool %{jrebindir}/keytool \
--slave %{_bindir}/orbd orbd %{jrebindir}/orbd \
--slave %{_bindir}/pack200 pack200 %{jrebindir}/pack200 \
@@ -625,8 +592,6 @@ alternatives \
--slave %{_bindir}/unpack200 unpack200 %{jrebindir}/unpack200 \
--slave %{_mandir}/man1/java.1$ext java.1$ext \
%{_mandir}/man1/java-%{name}.1$ext \
- --slave %{_mandir}/man1/javaws.1$ext javaws.1$ext \
- %{_mandir}/man1/javaws-%{name}.1$ext \
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \
%{_mandir}/man1/keytool-%{name}.1$ext \
--slave %{_mandir}/man1/orbd.1$ext orbd.1$ext \
@@ -656,13 +621,7 @@ alternatives \
--slave %{_jvmjardir}/jre-%{javaver} \
jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk}
-# Update for jnlp handling.
-update-desktop-database %{_datadir}/applications &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
-fi
exit 0
@@ -674,13 +633,6 @@ then
alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk}
fi
-# Update for jnlp handling.
-update-desktop-database %{_datadir}/applications &> /dev/null || :
-
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
-fi
exit 0
@@ -813,28 +765,9 @@ fi
exit 0
-%post plugin
-if [ $1 -gt 1 ]
-then
- alternatives --remove %{javaplugin} \
- %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so 2>/dev/null
-fi
-alternatives --remove %{javaplugin} \
- %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaNPPlugin.so 2>/dev/null
-alternatives \
- --install %{syslibdir}/mozilla/plugins/libjavaplugin.so %{javaplugin} \
- %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaPlugin.so %{priority}
-exit 0
-%postun plugin
-if [ $1 -eq 0 ]
-then
- alternatives --remove %{javaplugin} \
- %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaPlugin.so
-fi
-exit 0
%files -f %{name}.files
%defattr(-,root,root,-)
@@ -860,7 +793,6 @@ exit 0
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
%{_datadir}/icons/hicolor/*x*/apps/java.png
%{_mandir}/man1/java-%{name}.1*
-%{_mandir}/man1/javaws-%{name}.1*
%{_mandir}/man1/keytool-%{name}.1*
%{_mandir}/man1/orbd-%{name}.1*
%{_mandir}/man1/pack200-%{name}.1*
@@ -869,8 +801,6 @@ exit 0
%{_mandir}/man1/servertool-%{name}.1*
%{_mandir}/man1/tnameserv-%{name}.1*
%{_mandir}/man1/unpack200-%{name}.1*
-%{_datadir}/pixmaps/javaws.png
-%{_datadir}/applications/javaws.desktop
%{_jvmdir}/%{jredir}/lib/security/nss.cfg
%files devel
@@ -948,9 +878,6 @@ exit 0
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}
-%files plugin
-%defattr(-,root,root,-)
-%{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
%changelog
* Tue Feb 15 2011 Deepak Bhole <dbhole at redhat.com> 1:1.6.0.0-52.1.9.7
More information about the scm-commits
mailing list