SPECS: macromedia-flash.spec - make i686 package install on amd64

[glen]

Author: glen                         Date: Tue Aug 23 18:45:35 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- make i686 package install on amd64

---- Files affected:
SPECS:
   macromedia-flash.spec (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: SPECS/macromedia-flash.spec
diff -u SPECS/macromedia-flash.spec:1.30 SPECS/macromedia-flash.spec:1.31
--- SPECS/macromedia-flash.spec:1.30	Tue Aug 23 20:10:13 2005
+++ SPECS/macromedia-flash.spec	Tue Aug 23 20:45:30 2005
@@ -12,7 +12,7 @@
 Name:		%{base_name}-installer
 %endif
 Version:	7.0r25
-Release:	2.23%{?with_license_agreement:wla}
+Release:	2.26%{?with_license_agreement:wla}
 License:	Free to use, non-distributable
 Group:		X11/Applications/Multimedia
 %if %{with license_agreement}
@@ -22,7 +22,7 @@
 Source0:	license-installer.sh
 %endif
 URL:		http://www.macromedia.com/software/flash/
-BuildRequires:	rpmbuild(macros) >= 1.224
+BuildRequires:	rpmbuild(macros) >= 1.235
 Requires:	browser-plugins(%{_target_cpu})
 %if %{without license_agreement}
 Requires:	/usr/bin/builder
@@ -94,18 +94,22 @@
 
 %triggerin -- mozilla
 %nsplugin_install -d %{_libdir}/mozilla/plugins libflashplayer.so flashplayer.xpt
-umask 022
-rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat
-if [ -x /usr/bin/regxpcom ]; then
-	MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom
+if [ -d /usr/%{_lib}/mozilla ]; then
+	umask 022
+	rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat
+	if [ -x /usr/bin/regxpcom ]; then
+		MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom
+	fi
 fi
 
 %triggerun -- mozilla
 %nsplugin_uninstall -d %{_libdir}/mozilla/plugins libflashplayer.so flashplayer.xpt
-umask 022
-rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat
-if [ -x /usr/bin/regxpcom ]; then
-	MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom
+if [ -d /usr/%{_lib}/mozilla ]; then
+	umask 022
+	rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat
+	if [ -x /usr/bin/regxpcom ]; then
+		MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom
+	fi
 fi
 
 %triggerin -- konqueror
@@ -140,6 +144,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2005/08/23 18:45:30  glen
+- make i686 package install on amd64
+
 Revision 1.30  2005/08/23 18:10:13  glen
 - require correct arch of browser-plugins
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/macromedia-flash.spec?r1=1.30&r2=1.31&f=u