SPECS: macromedia-flash.spec - browser-plugins v2; rel 2

[glen]

Author: glen                         Date: Wed Jan 10 11:40:48 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- browser-plugins v2; rel 2

---- Files affected:
SPECS:
   macromedia-flash.spec (1.63 -> 1.64) 

---- Diffs:

================================================================
Index: SPECS/macromedia-flash.spec
diff -u SPECS/macromedia-flash.spec:1.63 SPECS/macromedia-flash.spec:1.64
--- SPECS/macromedia-flash.spec:1.63	Tue Jan  9 22:58:52 2007
+++ SPECS/macromedia-flash.spec	Wed Jan 10 12:40:43 2007
@@ -15,7 +15,7 @@
 %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
@@ -30,8 +30,8 @@
 %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
@@ -42,12 +42,6 @@
 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
@@ -56,13 +50,9 @@
 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}
@@ -85,78 +75,35 @@
 
 %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
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -165,6 +112,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.64  2007/01/10 11:40:43  glen
+- browser-plugins v2; rel 2
+
 Revision 1.63  2007/01/09 21:58:52  glen
 - update URL
 
================================================================

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