SPECS: gplflash.spec - browser plugins v2; rel 7

[glen]

Author: glen                         Date: Wed Jan 10 17:41:54 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- browser plugins v2; rel 7

---- Files affected:
SPECS:
   gplflash.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SPECS/gplflash.spec
diff -u SPECS/gplflash.spec:1.18 SPECS/gplflash.spec:1.19
--- SPECS/gplflash.spec:1.18	Sun Dec 10 13:14:03 2006
+++ SPECS/gplflash.spec	Wed Jan 10 18:41:49 2007
@@ -3,7 +3,7 @@
 Summary(pl):	Biblioteka renderująca animacje Flash
 Name:		gplflash
 Version:	0.4.13
-Release:	6
+Release:	7
 License:	GPL
 Group:		Libraries
 Source0:	http://dl.sourceforge.net/gplflash/%{name}-%{version}.tar.bz2
@@ -19,15 +19,13 @@
 BuildRequires:	libmad-devel >= 0.14.2b
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
-BuildRequires:	rpmbuild(macros) >= 1.236
+BuildRequires:	rpmbuild(macros) >= 1.357
 BuildRequires:	zlib-devel >= 1.1.4
 BuildConflicts:	flash
 Obsoletes:	flash
 Obsoletes:	gplflash2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_plugindir	%{_libdir}/browser-plugins
-
 %description
 GPLFLash is based on Olivier Debons original work, which hasn't had a
 release since June 2000. This project hope to bring GPLFlash back as a
@@ -78,6 +76,7 @@
 Group:		X11/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	browser-plugins(%{_target_base_arch})
+Requires:	browser-plugins >= 2.0
 # Provides for migrate purposes (greedy poldek upgrade)
 Provides:	mozilla-plugin-gplflash
 Obsoletes:	browser-plugin-gplflash2
@@ -85,25 +84,14 @@
 Obsoletes:	mozilla-plugin-gplflash
 Obsoletes:	mozilla-plugin-gplflash2
 
-# use macro, otherwise extra LF inserted along with the ifarch
-%ifarch %{ix86} ppc sparc sparc64
-%define	browsers mozilla, mozilla-firefox, opera, konqueror
-%else
-%define	browsers mozilla, mozilla-firefox, konqueror
-%endif
-
 %description -n browser-plugin-%{name}
 Browser plugin for rendering of Flash animations based on gplflash
 library.
 
-Supported browsers: %{browsers}.
-
 %description -n browser-plugin-%{name} -l pl
 Wtyczka przeglądarki wyświetlająca animacje Flash oparta na bibliotece
 gplflash.
 
-Obsługiwane przeglądarki: %{browsers}.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -115,7 +103,7 @@
 %{__autoconf}
 %{__automake}
 %configure \
-	--with-plugin-dir=%{_plugindir} \
+	--with-plugin-dir=%{_browserpluginsdir} \
 	--enable-shared \
 	--enable-static
 %{__make}
@@ -139,48 +127,13 @@
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%triggerin -n browser-plugin-%{name} -- mozilla-firefox
-%nsplugin_install -d %{_libdir}/mozilla-firefox/plugins libnpflash.so
-
-%triggerun -n browser-plugin-%{name} -- mozilla-firefox
-%nsplugin_uninstall -d %{_libdir}/mozilla-firefox/plugins libnpflash.so
-
-%triggerin -n browser-plugin-%{name} -- mozilla-firefox-bin
-%nsplugin_install -d %{_libdir}/mozilla-firefox-bin/plugins libnpflash.so
-
-%triggerun -n browser-plugin-%{name} -- mozilla-firefox-bin
-%nsplugin_uninstall -d %{_libdir}/mozilla-firefox-bin/plugins libnpflash.so
-
-%triggerin -n browser-plugin-%{name} -- mozilla
-%nsplugin_install -d %{_libdir}/mozilla/plugins libnpflash.so
+%post -n browser-plugin-%{name}
+%update_browser_plugins
 
-%triggerun -n browser-plugin-%{name} -- mozilla
-%nsplugin_uninstall -d %{_libdir}/mozilla/plugins libnpflash.so
-
-%ifarch %{ix86} ppc sparc sparc64
-%triggerin -n browser-plugin-%{name} -- opera
-%nsplugin_install -d %{_libdir}/opera/plugins libnpflash.so
-
-%triggerun -n browser-plugin-%{name} -- opera
-%nsplugin_uninstall -d %{_libdir}/opera/plugins libnpflash.so
-%endif
-
-%triggerin -n browser-plugin-%{name} -- konqueror
-%nsplugin_install -d %{_libdir}/kde3/plugins/konqueror libnpflash.so
-
-%triggerun -n browser-plugin-%{name} -- konqueror
-%nsplugin_uninstall -d %{_libdir}/kde3/plugins/konqueror libnpflash.so
-
-%triggerin -n browser-plugin-%{name} -- seamonkey
-%nsplugin_install -d %{_libdir}/seamonkey/plugins libnpflash.so
-
-%triggerun -n browser-plugin-%{name} -- seamonkey
-%nsplugin_uninstall -d %{_libdir}/seamonkey/plugins libnpflash.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-plugin-gplflash
-%nsplugin_install -f -d %{_libdir}/mozilla/plugins libnpflash.so
+%postun -n browser-plugin-%{name}
+if [ "$1" = 0 ]; then
+	%update_browser_plugins
+fi
 
 %files
 %defattr(644,root,root,755)
@@ -202,7 +155,7 @@
 
 %files -n browser-plugin-%{name}
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_plugindir}/libnpflash.so
+%attr(755,root,root) %{_browserpluginsdir}/libnpflash.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -210,6 +163,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2007/01/10 17:41:49  glen
+- browser plugins v2; rel 7
+
 Revision 1.18  2006/12/10 12:14:03  glen
 - rel 6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gplflash.spec?r1=1.18&r2=1.19&f=u