SPECS: macromedia-flash.spec - single package with triggers on bro...

glen glen at pld-linux.org
Tue Aug 23 19:22:45 CEST 2005 

Author: glen                         Date: Tue Aug 23 17:22:45 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- single package with triggers on browser packages

---- Files affected:
SPECS:
   macromedia-flash.spec (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: SPECS/macromedia-flash.spec
diff -u SPECS/macromedia-flash.spec:1.26 SPECS/macromedia-flash.spec:1.27
--- SPECS/macromedia-flash.spec:1.26	Tue Aug 23 18:47:51 2005
+++ SPECS/macromedia-flash.spec	Tue Aug 23 19:22:40 2005
@@ -12,7 +12,7 @@
 Name:		%{base_name}-installer
 %endif
 Version:	7.0r25
-Release:	2%{?with_license_agreement:wla}.2
+Release:	2.13%{?with_license_agreement:wla}
 License:	Free to use, non-distributable
 Group:		X11/Applications/Multimedia
 %if %{with license_agreement}
@@ -20,57 +20,33 @@
 # NoSource0-md5:	79c59a5ea29347e01c8e6575dd054cd1
 %endif
 URL:		http://www.macromedia.com/software/flash/
+BuildRequires:	rpmbuild(macros) >= 1.224
+Requires:	browser-plugins
+%if %{without license_agreement}
+Requires:	/usr/bin/builder
+%endif
+Obsoletes:	flash-plugin
+Obsoletes:	mozilla-plugin-macromedia-flash
+Obsoletes:	mozilla-firefox-plugin-macromedia-flash
+Obsoletes:	konqueror-plugin-macromedia-flash
 ExclusiveArch:	%{ix86}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_plugindir	%{_libdir}/browser-plugins
+
+# TODO: opera, galeon and skipstone.
+# use macro, otherwise extra LF inserted along with the ifarch
+%define	browsers mozilla, mozilla-firefox, konqueror
+
 %description
 Flash plugin for Netscape-compatible WWW browsers.
 
+Supported browsers: %{browsers}.
+
 %description -l pl
 Wtyczka Flash dla przeglądarek WWW zgodnych z Netscape.
 
-%package -n mozilla-plugin-macromedia-flash
-Summary:	Flash plugin for Mozilla based browsers
-Summary(pl):	Wtyczka Flash dla przeglądarek opartych na Mozilli
-Group:		X11/Applications/Multimedia
-PreReq:		mozilla-embedded >= 1.0
-Obsoletes:	flash-plugin
-
-%description -n mozilla-plugin-macromedia-flash
-This package contains flash plugin for Mozilla based browsers, i.e.
-mozilla itself, galeon or skipstone.
-
-%description -n mozilla-plugin-macromedia-flash -l pl
-Pakiet zawiera wtyczkę dla technologii Flash dla przeglądarek opartych
-na Mozilli, np.: mozilli jako takiej, galeona czy też skipstone'a.
-
-%package -n mozilla-firefox-plugin-macromedia-flash
-Summary:	Flash plugin for Mozilla Firefox browser
-Summary(pl):	Wtyczka Flash dla Mozilla Firefox
-Group:		X11/Applications/Multimedia
-PreReq:		mozilla-firefox
-Obsoletes:	flash-plugin
-
-%description -n mozilla-firefox-plugin-macromedia-flash
-This package contains flash plugin for Mozilla Firefox browser.
-
-%description -n mozilla-firefox-plugin-macromedia-flash -l pl
-Pakiet zawiera wtyczkę dla technologii Flash dla przeglądarki
-Mozilla Firefox.
-
-%package -n konqueror-plugin-macromedia-flash
-Summary:	Flash plugin for Konqueror browser
-Summary(pl):	Wtyczka obsługująca Flash dla przeglądarki Konqueror
-Group:		X11/Applications/Multimedia
-PreReq:		konqueror >= 3.0.8-2.3
-Obsoletes:	flash-plugin
-
-%description -n konqueror-plugin-macromedia-flash
-This package contains flash plugin for Konqueror browser.
-
-%description -n konqueror-plugin-macromedia-flash -l pl
-Pakiet zawiera wtyczkę obsługującą technologię Flash dla przeglądarki
-Konqueror.
+Supported browsers: %{browsers}.
 
 %prep
 %if %{with license_agreement}
@@ -115,28 +91,8 @@
 	if [ "$?" -ne 0 ]; then
 		exit 2
 	fi
-	RPMNAME1=mozilla-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm
-	RPMNAME2=mozilla-firefox-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm
-	RPMNAME3=konqueror-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm
-	RPMNAMES=
-	if rpm -q --whatprovides mozilla-embedded >/dev/null 2>&1; then
-		RPMNAMES=$RPMDIR/$RPMNAME1
-		echo "Installing $RPMNAME1"
-	else
-		echo "Not installing $RPMNAME1"
-	fi
-	if rpm -q mozilla-firefox >/dev/null 2>&1; then
-		RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME2"
-		echo "Installing $RPMNAME2"
-	else
-		echo "Not installing $RPMNAME2"
-	fi
-	if rpm -q konqueror >/dev/null 2>&1; then
-		RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME3"
-		echo "Installing $RPMNAME3"
-	else
-		echo "Not installing $RPMNAME3"
-	fi
+	RPMNAME=%{base_name}-%{version}-%{release}wla.%{_target_cpu}.rpm
+	RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME"
 	rpm -U $RPMNAMES || echo -e "Install manually the file(s):\n   $RPMNAMES" )
 	if [ "$BACKUP" -eq 1 ]; then
 		if [ -f $SPECDIR/%{base_name}.spec.prev ]; then
@@ -158,11 +114,8 @@
 
 %else
 
-install -d $RPM_BUILD_ROOT%{_libdir}/{mozilla/plugins,/mozilla-firefox/plugins,/kde3/plugins/konqueror}
-
-install *.{so,xpt} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
-install *.{so,xpt} $RPM_BUILD_ROOT%{_libdir}/mozilla-firefox/plugins
-install *.so $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/konqueror
+install -d $RPM_BUILD_ROOT%{_plugindir}
+install *.{so,xpt} $RPM_BUILD_ROOT%{_plugindir}
 
 %endif
 
@@ -178,42 +131,48 @@
 
 %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec
 "
-%endif
+%else
 
-%post -n mozilla-plugin-macromedia-flash
+%triggerin -- mozilla-firefox
+%nsplugin_install -d %{_libdir}/mozilla-firefox/plugins libflashplayer.so flashplayer.xpt
+
+%triggerun -- mozilla-firefox
+%nsplugin_uninstall -d %{_libdir}/mozilla-firefox/plugins libflashplayer.so flashplayer.xpt
+
+%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
 fi
 
-%postun -n mozilla-plugin-macromedia-flash
+%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
 fi
 
-%if %{without license_agreement}
+%triggerin -- konqueror
+%nsplugin_install -d %{_libdir}/kde3/plugins/konqueror libflashplayer.so
+
+%triggerun -- konqueror
+%nsplugin_uninstall -d %{_libdir}/kde3/plugins/konqueror libflashplayer.so
+
+%endif
+
 %files
 %defattr(644,root,root,755)
+
+%if %{without license_agreement}
 %attr(755,root,root) %{_bindir}/%{base_name}.install
 %{_datadir}/%{base_name}
 
 %else
-%files -n mozilla-plugin-macromedia-flash
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/mozilla/plugins/*.so
-%{_libdir}/mozilla/plugins/*.xpt
-
-%files -n mozilla-firefox-plugin-macromedia-flash
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/mozilla-firefox/plugins/*.so
-%{_libdir}/mozilla-firefox/plugins/*.xpt
-
-%files -n konqueror-plugin-macromedia-flash
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/kde3/plugins/konqueror/*.so
+%attr(755,root,root) %{_plugindir}/*.so
+%{_plugindir}/*.xpt
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -222,6 +181,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2005/08/23 17:22:40  glen
+- single package with triggers on browser packages
+
 Revision 1.26  2005/08/23 16:47:51  glen
 - use without macro
 
================================================================

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

More information about the pld-cvs-commit mailing list