- browser-plugins v2; rel 2

Changed files:
    adobe-flash.spec -> 1.64

diff --git a/adobe-flash.spec b/adobe-flash.spec
index 83ddf68fb41e6f3d80ec870631908aa9f25bc279..7993c8f4a0314256ab40e06432a4164b809daae1 100644 (file)
--- a/adobe-flash.spec
+++ b/adobe-flash.spec
@@ -14,7 +14,7 @@ Name:         %{base_name}
 %else
 Name:          %{base_name}-installer
 %endif
-%define                _rel 1
+%define                _rel 2
 Version:       %{_ver_major}.%{_ver_minor}.%{_ver_patch}.%{_ver_serial}
 Release:       %{_rel}%{?with_license_agreement:wla}
 License:       Free to use, non-distributable
@@ -29,8 +29,8 @@ Source0:      license-installer.sh
 %endif
 URL:           http://labs.adobe.com/technologies/flashplayer9/
 %if %{with license_agreement}
-BuildRequires: rpmbuild(macros) >= 1.236
-Requires:      browser-plugins(%{_target_base_arch})
+BuildRequires: rpmbuild(macros) >= 1.357
+Requires:      browser-plugins >= 2.0
 %else
 Requires:      rpm-build-tools
 %endif
@@ -41,12 +41,6 @@ Obsoletes:   mozilla-plugin-macromedia-flash
 ExclusiveArch: %{ix86}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _plugindir      %{_libdir}/browser-plugins
-
-# TODO: galeon and skipstone.
-# use macro, otherwise extra LF inserted along with the ifarch
-%define        browsers mozilla, mozilla-firefox, mozilla-firefox-bin, konqueror, opera, seamonkey
-
 %description
 Adobe(R) Flash(R) Player is the high-performance, lightweight, highly expressive
 client runtime that delivers powerful and consistent user experiences across
@@ -55,13 +49,9 @@ over 700 million Internet-connected desktops and mobile devices, Flash Player
 enables organizations and individuals to build and deliver great digital
 experiences to their end users.
 
-Supported browsers: %{browsers}.
-
 %description -l pl
 Wtyczka Flash dla przegl±darek WWW zgodnych z Netscape.
 
-Obs³ugiwane przegl±darki: %{browsers}.
-
 %prep
 %if %{with license_agreement}
 %setup -q -n flash-player-plugin-%{_ver_major}.%{_ver_minor}.%{_ver_patch}.%{_ver_serial}
@@ -84,76 +74,33 @@ install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name}
 
 %else
 
-install -d $RPM_BUILD_ROOT%{_plugindir}
-install *.so $RPM_BUILD_ROOT%{_plugindir}
+install -d $RPM_BUILD_ROOT%{_browserpluginsdir}
+install *.so $RPM_BUILD_ROOT%{_browserpluginsdir}
 
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if !%{with license_agreement}
+%if %{without license_agreement}
 %post
 %{_bindir}/%{base_name}.install
-
 %else
+%post
+%update_browser_plugins
 
-%triggerin -- mozilla-firefox
-%nsplugin_install -d %{_libdir}/mozilla-firefox/plugins libflashplayer.so
-
-%triggerun -- mozilla-firefox
-%nsplugin_uninstall -d %{_libdir}/mozilla-firefox/plugins libflashplayer.so
-
-%triggerin -- mozilla-firefox-bin
-%nsplugin_install -d %{_libdir}/mozilla-firefox-bin/plugins libflashplayer.so
-
-%triggerun -- mozilla-firefox-bin
-%nsplugin_uninstall -d %{_libdir}/mozilla-firefox-bin/plugins libflashplayer.so
-
-%triggerin -- mozilla
-%nsplugin_install -d %{_libdir}/mozilla/plugins libflashplayer.so
-
-%triggerun -- mozilla
-%nsplugin_uninstall -d %{_libdir}/mozilla/plugins libflashplayer.so
-
-%triggerin -- konqueror
-%nsplugin_install -d %{_libdir}/kde3/plugins/konqueror libflashplayer.so
-
-%triggerun -- konqueror
-%nsplugin_uninstall -d %{_libdir}/kde3/plugins/konqueror libflashplayer.so
-
-%triggerin -- opera
-%nsplugin_install -d %{_libdir}/opera/plugins libflashplayer.so
-
-%triggerun -- opera
-%nsplugin_uninstall -d %{_libdir}/opera/plugins libflashplayer.so
-
-%triggerin -- seamonkey
-%nsplugin_install -d %{_libdir}/seamonkey/plugins libflashplayer.so
-
-%triggerun -- seamonkey
-%nsplugin_uninstall -d %{_libdir}/seamonkey/plugins libflashplayer.so
-
-# as rpm removes the old obsoleted package files after the triggers
-# above are ran, add another trigger to make the links there.
-%triggerpostun -- mozilla-firefox-plugin-macromedia-flash
-%nsplugin_install -f -d %{_libdir}/mozilla-firefox/plugins libflashplayer.so flashplayer.xpt
-
-%triggerpostun -- mozilla-plugin-macromedia-flash
-%nsplugin_install -f -d %{_libdir}/mozilla/plugins libflashplayer.so flashplayer.xpt
-
-%triggerpostun -- konqueror-plugin-macromedia-flash
-%nsplugin_install -f -d %{_libdir}/kde3/plugins/konqueror libflashplayer.so
+%postun
+if [ "$1" = 0 ]; then
+       %update_browser_plugins
+fi
 %endif
 
 %files
 %defattr(644,root,root,755)
-
-%if !%{with license_agreement}
+%if %{without license_agreement}
 %attr(755,root,root) %{_bindir}/%{base_name}.install
 %{_datadir}/%{base_name}
-
 %else
 %doc *.txt
-%attr(755,root,root) %{_plugindir}/*.so
+%attr(755,root,root) %{_browserpluginsdir}/*.so
 %endif