Module name: SPECS
Changes by: glen 05/08/23 20:45:30
Modified files:
macromedia-flash.spec
Log message:
- make i686 package install on amd64
Index: macromedia-flash.spec
===================================================================
RCS file: /cvsroot/SPECS/macromedia-flash.spec,v
diff -d -u -r1.30 -r1.31
--- macromedia-flash.spec 23 Aug 2005 18:10:13 -0000 1.30
+++ macromedia-flash.spec 23 Aug 2005 18:45:30 -0000 1.31
@@ -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
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
