Hello community, here is the log from the commit of package classpath checked in at Thu Apr 26 01:00:01 CEST 2007. -------- --- classpath/classpath.changes 2007-04-24 18:42:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/classpath/classpath.changes 2007-04-25 16:35:51.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 25 16:35:31 CEST 2007 - dbornkessel@suse.de + +- handle plugin with update-alternative mechanism (fixes collect-desktop-files problem and gives users control over which plugin is used) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ classpath.spec ++++++ --- /var/tmp/diff_new_pack.G29291/_old 2007-04-26 00:59:17.000000000 +0200 +++ /var/tmp/diff_new_pack.G29291/_new 2007-04-26 00:59:17.000000000 +0200 @@ -11,6 +11,10 @@ # norootforbuild Name: classpath +%define pluginsdir %{_libdir}/browser-plugins +#%define priority 1530 +# high priority because this is currently the only plugin working +%define priority 1700 BuildRequires: antlr-bootstrap ecj-bootstrap gcc-c++ gcc-gij gcc-java gtk2-devel jpackage-utils libgcj-devel zip BuildRequires: gjdoc > 0.7.7 %if %{?!suse_version:1}0 @@ -36,7 +40,7 @@ Group: Development/Libraries/Java Autoreqprov: on Version: 0.95 -Release: 1 +Release: 3 Summary: GNU implementation of the essential libraries for Java URL: http://www.gnu.org/software/classpath/ Source: %{name}-%{version}.tar.bz2 @@ -231,6 +235,7 @@ %if %suse_version > 1010 Requires: mozilla-xulrunner%{xulrunner_version} %endif +PreReq: update-alternatives %description webplugin GNU Classpath, Essential Libraries for Java, is a GNU project to create @@ -429,6 +434,21 @@ rm -f $RPM_BUILD_ROOT/%_prefix/lib/security/classpath.security #find $RPM_BUILD_ROOT/ . -name "*.la" -delete +%post webplugin + # set link to plugin lib + cd %{pluginsdir} + JAVAPLUGINS=$(ls -1 | grep "\(java\|gcj\)" | grep -v javaplugin.so || true ) + if [ -n "$JAVAPLUGINS" ] + then + rm -rf $JAVAPLUGINS || true + fi + update-alternatives --install %{pluginsdir}/javaplugin.so javaplugin %{_libdir}/%{name}/libgcjwebplugin.so %{priority} + +%preun webplugin + if [ "$1" = "0" ] ; then + update-alternatives --remove javaplugin %{_libdir}/%{name}/libgcjwebplugin.so + fi + %clean rm -rf $RPM_BUILD_ROOT @@ -472,6 +492,8 @@ %{_libdir}/%{name}/libgcjwebplugin.la %changelog +* Wed Apr 25 2007 - dbornkessel@suse.de +- handle plugin with update-alternative mechanism (fixes collect-desktop-files problem and gives users control over which plugin is used) * Tue Apr 24 2007 - dbornkessel@suse.de - update to 0.95: * plugin works ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org