- unified bcond header

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

diff --git a/adobe-flash.spec b/adobe-flash.spec
index ab568915c114c8d6c934f3f7ad5e83f85d0b160b..c9c095340812f4943bb28389a71a72cfc180ec6b 100644 (file)
--- a/adobe-flash.spec
+++ b/adobe-flash.spec
@@ -2,6 +2,9 @@
 # Conditional build:
 %bcond_with    license_agreement       # generates package
 #
+%define                _ver_major      7
+%define                _ver_minor      0
+%define                _ver_patch      25
 Summary:       Flash plugin for Netscape-compatible WWW browsers
 Summary(pl):   Wtyczka Flash dla przegl±darek WWW zgodnych z Netscape
 %define                base_name       macromedia-flash
@@ -10,21 +13,25 @@ Name:               %{base_name}
 %else
 Name:          %{base_name}-installer
 %endif
-Version:       7.0r25
-Release:       2.26%{?with_license_agreement:wla}
+Version:       %{_ver_major}.%{_ver_minor}.%{_ver_patch}
+Release:       4%{?with_license_agreement:wla}
 License:       Free to use, non-distributable
 Group:         X11/Applications/Multimedia
 %if %{with license_agreement}
-Source0:       http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/%{version}/install_flash_player_7_linux.tar.gz
+Source0:       http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/%{_ver_major}.%{_ver_minor}r%{_ver_patch}/install_flash_player_%{_ver_major}_linux.tar.gz
 # NoSource0-md5:       79c59a5ea29347e01c8e6575dd054cd1
 %else
 Source0:       license-installer.sh
 %endif
-URL:           http://www.macromedia.com/software/flash/
-BuildRequires: rpmbuild(macros) >= 1.235
+URL:           http://www.macromedia.com/software/flashplayer/
+%if %{with license_agreement}
+BuildRequires: rpmbuild(macros) >= 1.236
+%endif
 Requires:      browser-plugins(%{_target_cpu})
 %if %{without license_agreement}
-Requires:      /usr/bin/builder
+Requires:      cpio
+Requires:      rpm-build-tools
+Requires:      wget
 %endif
 Obsoletes:     flash-plugin
 Obsoletes:     mozilla-plugin-macromedia-flash
@@ -47,7 +54,7 @@ Supported browsers: %{browsers}.
 %description -l pl
 Wtyczka Flash dla przegl±darek WWW zgodnych z Netscape.
 
-Supported browsers: %{browsers}.
+Obs³ugiwane przegl±darki: %{browsers}.
 
 %prep
 %if %{with license_agreement}
@@ -80,7 +87,7 @@ install *.{so,xpt} $RPM_BUILD_ROOT%{_plugindir}
 rm -rf $RPM_BUILD_ROOT
 
 %if %{without license_agreement}
-%pre
+%post
 %{_bindir}/%{base_name}.install
 
 %else
@@ -123,6 +130,16 @@ fi
 %triggerun -- opera
 %nsplugin_uninstall -d %{_libdir}/opera/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
 %endif
 
 %files