- update URL

[packages/adobe-flash.git] / adobe-flash.spec

diff --git a/adobe-flash.spec b/adobe-flash.spec
index 83ddf68fb41e6f3d80ec870631908aa9f25bc279..ee54b06b8ebade9c89f96951d057ffcd8a86964b 100644 (file)
--- a/adobe-flash.spec
+++ b/adobe-flash.spec
@@ -4,8 +4,8 @@
 #
 %define                _ver_major      9
 %define                _ver_minor      0
-%define                _ver_patch      21
-%define                _ver_serial     78
+%define                _ver_patch      31
+%define                _ver_serial     0
 %define                base_name       macromedia-flash
 Summary:       Flash plugin for Netscape-compatible WWW browsers
 Summary(pl):   Wtyczka Flash dla przegl±darek WWW zgodnych z Netscape
@@ -20,17 +20,16 @@ Release:    %{_rel}%{?with_license_agreement:wla}
 License:       Free to use, non-distributable
 Group:         X11/Applications/Multimedia
 %if %{with license_agreement}
-#Source0:      http://download.macromedia.com/pub/labs/flashplayer9_update/FP9_plugin_beta_101806.tar.gz
-Source0:       http://download.macromedia.com/pub/labs/flashplayer9_update/FP9_plugin_beta_112006.tar.gz
-# NoSource0-md5:       3ab408f85ae6d8180cc913edf97bf3eb
+Source0:       http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_9_linux.tar.gz
+# NoSource0-md5:       76b38231a68995935185aa42dfda9db7
 %else
 Source0:       license-installer.sh
-# NoSource0-md5:       3ab408f85ae6d8180cc913edf97bf3eb
+# NoSource0-md5:       76b38231a68995935185aa42dfda9db7
 %endif
-URL:           http://labs.adobe.com/technologies/flashplayer9/
+URL:           http://www.adobe.com/products/flashplayer/
 %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,11 +40,7 @@ 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
+%define                _sysconfdir     /etc/adobe
 
 %description
 Adobe(R) Flash(R) Player is the high-performance, lightweight, highly expressive
@@ -55,21 +50,17 @@ 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}
+%setup -q -n install_flash_player_%{_ver_major}_linux
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%if !%{with license_agreement}
+%if %{without license_agreement}
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}}
 
 sed -e '
@@ -84,76 +75,40 @@ 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{%{_sysconfdir},%{_browserpluginsdir}}
+cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/mms.cfg
+# http://www.adobe.com/cfusion/knowledgebase/index.cfm?id=16701594
+AutoUpdateDisable=1
+AutoUpdateInterval=0
+EOF
+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
+%dir %{_sysconfdir}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mms.cfg
+%attr(755,root,root) %{_browserpluginsdir}/*.so
 %endif