...some fixes on mozilla plug-ins install

Christian

-- 
[EMAIL PROTECTED], OpenPGP key available on www.keyserver.net
1024D/2D3C2E70   6241 A35C DD72 242E 5430  2D01 F732 1EEF 2D3C 2E7

 - Littlepenguin Team      www.littlepenguin.org
 - jPackage Team           jpackage.sourceforge.net
 - Genetix Team            genetix.sourceforge.net
--- mozilla.spec.old    Sat Jul 14 17:32:39 2001
+++ mozilla.spec        Sat Jul 14 17:34:16 2001
@@ -3,7 +3,7 @@
 Name:      mozilla
 Summary:   Mozilla, open-source web browser
 Version:   0.9.2
-Release:   6mdk
+Release:   7mdk
 Copyright: MPL
 Source0:   
ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla%{version}/src/mozilla-source-%{version}.tar.bz2
 Source1:   mozilla.sh.bz2
@@ -29,47 +29,48 @@
 Patch24:   mozilla-0.9.2-fileutils.patch.bz2
 Serial: 0
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: autoconf gtk+-devel libjpeg-devel libnspr4-devel libpng-devel zip 
ORBit-devel zip
+BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+BuildRequires:         autoconf gtk+-devel libjpeg-devel libnspr4-devel libpng-devel 
+zip ORBit-devel zip
 # pulled by libraries dependency
-#Requires: libpng, libjpeg, zlib, ORBit
-PreReq: libnspr4
-Requires: libnss3 indexhtml 
-
-Prefix:    %{_prefix}
-ExcludeArch: ia64
-
-Group:     Networking/WWW
-Url: http://www.mozilla.org
-Obsoletes: mozilla-xpcom mozilla-browser mozilla-psm
-Provides: mozilla-psm = %{version}
+#Requires:     libpng, libjpeg, zlib, ORBit
+PreReq:        libnspr4
+Requires:      libnss3 indexhtml 
+
+Prefix:        %{_prefix}
+ExcludeArch:   ia64
+
+Group:         Networking/WWW
+Url:           http://www.mozilla.org
+Obsoletes:     mozilla-xpcom mozilla-browser mozilla-psm
+Provides:      mozilla-psm = %{version}
 
 %description
 Mozilla is an open-source web browser, designed for standards
 compliance, performance and portability. 
 
 %package devel
-Requires: %{name} = %{version}
-Summary: Mozilla development files
-Group: Development/Other
+Requires:      %{name} = %{version}
+Summary:       Mozilla development files
+Group:                 Development/Other
+
 %description devel
 Mozilla development files
 
 %package mail
-Summary: Mozilla-based mail system
-Group: Networking/Mail
-PreReq: %{name} = %{version}
+Summary:       Mozilla-based mail system
+Group:                 Networking/Mail
+PreReq:        %{name} = %{version}
 
 %description mail
 Mail/news client based on the Mozilla web browser.  The mail/news
 client supports IMAP, POP, and NNTP and has an easy to use interface.
 
 %package irc
-Summary: IRC support for Mozilla.
-Group: Networking/IRC
-PreReq: %{name} = %{version}
-Provides: %{name}-chatzilla %{name}-chat
-Obsoletes: %{name}-chatzilla %{name}-chat
+Summary:       IRC support for Mozilla.
+Group:                 Networking/IRC
+PreReq:        %{name} = %{version}
+Provides:      %{name}-chatzilla %{name}-chat
+Obsoletes:     %{name}-chatzilla %{name}-chat
 
 %description irc
 irc support for Mozilla.
@@ -77,12 +78,12 @@
 %package xmlterm
 Summary:        XML enabled Terminal Client for Mozilla
 Group:          Networking/Other
-Prereq: %{name} = %{version}
+Prereq:        %{name} = %{version}
 
 %description xmlterm
 This is a terminal client written for mozilla that has special capabilities.
-   When combined with the xls, and xcat programs, you can get directory listings with
-   thumbnails for images, and you can cat known file types and view them inline.
+When combined with the xls, and xcat programs, you can get directory listings with
+thumbnails for images, and you can cat known file types and view them inline.
 
 %prep
 rm -rf $RPM_BUILD_ROOT
@@ -387,50 +388,48 @@
 rm -f /tmp/mozilla*.list
 rm -f /tmp/mozilla*.list.shared
 
+
 %triggerin -- jre >= 1.3.0_01
 if [ -f /usr/java/jre*/plugin/i386/ns600/libjavaplugin_oji.so -a ! -f 
%{_libdir}/mozilla/plugins/libjavaplugin_oji.so ]; then 
- ln -s /usr/java/jre*/plugin/i386/ns600/libjavaplugin_oji.so 
%{_libdir}/mozilla/plugins/libjavaplugin_oji.so 
+       ln -s /usr/java/jre*/plugin/i386/ns600/libjavaplugin_oji.so 
+%{_libdir}/mozilla/plugins/libjavaplugin_oji.so 
 fi
 
 %triggerin -- jdk >= 1.3.0_01
 if [ -f /usr/java/jdk*/jre/plugin/i386/ns600/libjavaplugin_oji.so -a ! -f 
%{_libdir}/mozilla/plugins/libjavaplugin_oji.so ]; then 
- ln -s /usr/java/jdk*/jre/plugin/i386/ns600/libjavaplugin_oji.so 
%{_libdir}/mozilla/plugins/libjavaplugin_oji.so 
+       ln -s /usr/java/jdk*/jre/plugin/i386/ns600/libjavaplugin_oji.so 
+%{_libdir}/mozilla/plugins/libjavaplugin_oji.so 
 fi
 
 %triggerin -- j2sdk >= 1.3.1
 if [ -f /usr/java/j2sdk*/jre/plugin/i386/ns600/libjavaplugin_oji*.so -a ! -f 
%{_libdir}/mozilla/plugins/libjavaplugin_oji*.so ]; then 
- ln -s /usr/java/j2sdk*/jre/plugin/i386/ns600/libjavaplugin_oji*.so 
%{_libdir}/mozilla/plugins/
+       ln -s /usr/java/j2sdk*/jre/plugin/i386/ns600/libjavaplugin_oji*.so 
+%{_libdir}/mozilla/plugins/
+fi
+
+%triggerin -- RealPlayer 
+if [ -f %{_libdir}/RealPlayer*/rpnp.so -a ! -f %{_libdir}/mozilla/plugins/rpnp.so ]; 
+then
+       ln -s %{_libdir}/RealPlayer*/rpnp.so %{_libdir}/mozilla/plugins/rpnp.so
+       ln -s %{_libdir}/RealPlayer*/raclass.zip %{_libdir}/mozilla/plugins/raclass.zip
 fi
 
+
 %triggerun -- jre >= 1.3.0_01
-if [  /usr/java/jre*/plugin/i386/ns600/libjavaplugin_oji.so -ef \
- %{_libdir}/mozilla/plugins/libjavaplugin_oji.so ]; then 
- rm -f %{_libdir}/mozilla/plugins/libjavaplugin_oji.so 
+if [ -e %{_libdir}/mozilla/plugins/libjavaplugin_oji.so ]; then 
+       rm -f %{_libdir}/mozilla/plugins/libjavaplugin_oji.so 
 fi
 
 %triggerun -- jdk >= 1.3.0_01
-if [  /usr/java/jdk*/jre/plugin/i386/ns600/libjavaplugin_oji.so -ef \
- %{_libdir}/mozilla/plugins/libjavaplugin_oji.so ]; then 
- rm -f %{_libdir}/mozilla/plugins/libjavaplugin_oji.so 
+if [ -e %{_libdir}/mozilla/plugins/libjavaplugin_oji.so ]; then 
+       rm -f %{_libdir}/mozilla/plugins/libjavaplugin_oji.so 
 fi
 
 %triggerun -- j2sdk >= 1.3.1
-if [  /usr/java/j2sdk*/jre/plugin/i386/ns600/libjavaplugin_oji*.so -ef \
- %{_libdir}/mozilla/plugins/libjavaplugin_oji*.so ]; then 
- rm -f %{_libdir}/mozilla/plugins/libjavaplugin_oji*.so 
+if [ -e %{_libdir}/mozilla/plugins/libjavaplugin_oji*.so ]; then 
+       rm -f %{_libdir}/mozilla/plugins/libjavaplugin_oji*.so 
 fi
 
-%triggerin -- RealPlayer 
-if [  %{_libdir}/RealPlayer*/rpnp.so -a ! -f %{_libdir}/mozilla/plugins/rpnp.so ]; 
then
- ln -s %{_libdir}/RealPlayer*/rpnp.so %{_libdir}/mozilla/plugins/rpnp.so
- ln -s %{_libdir}/RealPlayer*/raclass.zip %{_libdir}/mozilla/plugins/raclass.zip
-fi
-
-
 %triggerun -- RealPlayer 
-if [  %{_libdir}/RealPlayer*/rpnp.so -ef %{_libdir}/mozilla/plugins/rpnp.so ]; then
- rm -f %{_libdir}/mozilla/plugins/rpnp.so
- rm -f %{_libdir}/mozilla/plugins/raclass.zip
+if [ -e %{_libdir}/mozilla/plugins/rpnp.so ]; then
+       rm -f %{_libdir}/mozilla/plugins/rpnp.so
+       rm -f %{_libdir}/mozilla/plugins/raclass.zip
 fi
 
 
@@ -438,13 +437,13 @@
 # menu
 %{update_menus}
 if [ -f /usr/lib/netscape/plugins/libflashplayer.so -a ! -f 
%{_libdir}/mozilla/plugins/libflashplayer.so ]; then 
- ln -s /usr/lib/netscape/plugins/libflashplayer.so 
%{_libdir}/mozilla/plugins/libflashplayer.so 
+       ln -s /usr/lib/netscape/plugins/libflashplayer.so 
+%{_libdir}/mozilla/plugins/libflashplayer.so 
 fi
 ulimit -c 0
 # run ldconfig before regxpcom
 /sbin/ldconfig >/dev/null 2>/dev/null
 
-if [ -f /usr/lib/mozilla/rebuild-databases.sh ]; then
+if [ -x /usr/lib/mozilla/rebuild-databases.sh ]; then
     /usr/lib/mozilla/rebuild-databases.sh
 fi
 
@@ -465,7 +464,7 @@
 # run ldconfig before regxpcom
 /sbin/ldconfig >/dev/null 2>/dev/null
 
-if [ -f /usr/lib/mozilla/rebuild-databases.sh ]; then
+if [ -x /usr/lib/mozilla/rebuild-databases.sh ]; then
     /usr/lib/mozilla/rebuild-databases.sh
 fi
 
@@ -474,7 +473,7 @@
 # run ldconfig before regxpcom
 /sbin/ldconfig >/dev/null 2>/dev/null
 
-if [ -f /usr/lib/mozilla/rebuild-databases.sh ]; then
+if [ -x /usr/lib/mozilla/rebuild-databases.sh ]; then
     /usr/lib/mozilla/rebuild-databases.sh
 fi
 
@@ -483,7 +482,7 @@
 # run ldconfig before regxpcom
 /sbin/ldconfig >/dev/null 2>/dev/null
 
-if [ -f /usr/lib/mozilla/rebuild-databases.sh ]; then
+if [ -x /usr/lib/mozilla/rebuild-databases.sh ]; then
     /usr/lib/mozilla/rebuild-databases.sh
 fi
 
@@ -492,7 +491,7 @@
 # run ldconfig before regxpcom
 /sbin/ldconfig >/dev/null 2>/dev/null
 
-if [ -f /usr/lib/mozilla/rebuild-databases.sh ]; then
+if [ -x /usr/lib/mozilla/rebuild-databases.sh ]; then
     /usr/lib/mozilla/rebuild-databases.sh
 fi
 
@@ -501,7 +500,7 @@
 # run ldconfig before regxpcom
 /sbin/ldconfig >/dev/null 2>/dev/null
 
-if [ -f /usr/lib/mozilla/rebuild-databases.sh ]; then
+if [ -x /usr/lib/mozilla/rebuild-databases.sh ]; then
     /usr/lib/mozilla/rebuild-databases.sh
 fi
 
@@ -510,7 +509,7 @@
 # run ldconfig before regxpcom
 /sbin/ldconfig >/dev/null 2>/dev/null
 
-if [ -f /usr/lib/mozilla/rebuild-databases.sh ]; then
+if [ -x /usr/lib/mozilla/rebuild-databases.sh ]; then
     /usr/lib/mozilla/rebuild-databases.sh
 fi
 
@@ -572,6 +571,10 @@
 %{_menudir}/%{name}-xmlterm
 
 %changelog
+* Sat Jul 14 2001 Christian Zoffoli <[EMAIL PROTECTED]> 0.9.2-7mdk
+- fixed plug-in install/remove
+- little changes on checks
+
 * Fri Jul 13 2001 Stefan van der Eijk <[EMAIL PROTECTED]> 0.9.2-6mdk
 - BuildRequires:       gtk+-devel
 - Removed BuildRequires:       perl
@@ -733,3 +736,4 @@
 - bz2 archive
 - remove the paths in the post sections
 - modified the install section
+

Reply via email to