Author: glen Date: Thu May 4 23:32:15 2006 GMT Module: SPECS Tag: AC-branch ---- Log message: - use browser plugins, rel 2
---- Files affected: SPECS: swfdec.spec (1.37.2.1 -> 1.37.2.2) ---- Diffs: ================================================================ Index: SPECS/swfdec.spec diff -u SPECS/swfdec.spec:1.37.2.1 SPECS/swfdec.spec:1.37.2.2 --- SPECS/swfdec.spec:1.37.2.1 Fri May 5 00:19:40 2006 +++ SPECS/swfdec.spec Fri May 5 01:32:10 2006 @@ -7,7 +7,7 @@ Summary(pl): Biblioteka renderująca animacje flash Name: swfdec Version: 0.3.5 -Release: 1 +Release: 2 License: GPL Group: Libraries Source0: http://www.schleef.org/swfdec/download/%{name}-%{version}.tar.gz @@ -38,6 +38,7 @@ %if %{with gimp} %define gimpplugindir %(gimptool --gimpplugindir)/plug-ins %endif +%define _plugindir %{_libdir}/browser-plugins %description Libswfdec is a library for rendering Flash animations. Currently it @@ -91,17 +92,32 @@ %description -n gimp-plugin-%{name} -l pl Filtr wczytujący pliki SWF dla GIMP-a. -%package -n mozilla-plugin-%{name} -Summary: Mozilla plugin for Flash rendering -Summary(pl): Wtyczka mozilli wuświetlająca animacje flash +%package -n browser-plugin-%{name} +Summary: Browser plugin for Flash rendering +Summary(pl): Wtyczka przeglądarki wyświetlająca animacje Flash Group: X11/Libraries Requires: %{name} = %{version}-%{release} +Requires: browser-plugins(%{_target_base_arch}) +Obsoletes: mozilla-plugin-%{name} -%description -n mozilla-plugin-%{name} -Mozilla plugin for rendering of Flash animations based on swfdec library. +# use macro, otherwise extra LF inserted along with the ifarch +%ifarch %{ix86} ppc sparc sparc64 +%define browsers mozilla, mozilla-firefox, seamonkey, opera, konqueror +%else +%define browsers mozilla, mozilla-firefox, seamonkey, konqueror +%endif + +%description -n browser-plugin-%{name} +Browser plugin for rendering of Flash animations based on swfdec +library. + +Supported browsers: %{browsers}. + +%description -n browser-plugin-%{name} -l pl +Wtyczka przeglądarki wyświetlająca animacje Flash oparta na bibliotece +swfdec. -%description -n mozilla-plugin-%{name} -l pl -Wtyczka mozilli wyświetlająca animacje flash bazująca na bibliotece swfdec. +Obsługiwane przeglądarki: %{browsers}. %prep %setup -q @@ -114,7 +130,7 @@ %{__autoconf} %{__automake} %configure \ - %{?!with_gstreamer:--disable-mozilla-plugin} + %{!?with_gstreamer:--disable-mozilla-plugin} %{__make} \ gimpdir=%{gimpplugindir} @@ -124,10 +140,11 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ + plugindir=%{_plugindir} \ gimpdir=%{gimpplugindir} \ pkgconfigdir=%{_pkgconfigdir} -rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/*.{a,la} \ +rm -f $RPM_BUILD_ROOT%{_plugindir}/*.{a,la} \ $RPM_BUILD_ROOT%{_libdir}/gtk-*/*/loaders/*.{a,la} %clean @@ -136,6 +153,43 @@ %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%triggerin -n browser-plugin-%{name} -- mozilla-firefox +%nsplugin_install -d %{_libdir}/mozilla-firefox/plugins libswfdecmozilla.so + +%triggerun -n browser-plugin-%{name} -- mozilla-firefox +%nsplugin_uninstall -d %{_libdir}/mozilla-firefox/plugins libswfdecmozilla.so + +%triggerin -n browser-plugin-%{name} -- mozilla +%nsplugin_install -d %{_libdir}/mozilla/plugins libswfdecmozilla.so + +%triggerun -n browser-plugin-%{name} -- mozilla +%nsplugin_uninstall -d %{_libdir}/mozilla/plugins libswfdecmozilla.so + +%ifarch %{ix86} ppc sparc sparc64 +%triggerin -n browser-plugin-%{name} -- opera +%nsplugin_install -d %{_libdir}/opera/plugins libswfdecmozilla.so + +%triggerun -n browser-plugin-%{name} -- opera +%nsplugin_uninstall -d %{_libdir}/opera/plugins libswfdecmozilla.so +%endif + +%triggerin -n browser-plugin-%{name} -- konqueror +%nsplugin_install -d %{_libdir}/kde3/plugins/konqueror libswfdecmozilla.so + +%triggerun -n browser-plugin-%{name} -- konqueror +%nsplugin_uninstall -d %{_libdir}/kde3/plugins/konqueror libswfdecmozilla.so + +%triggerin -n browser-plugin-%{name} -- seamonkey +%nsplugin_install -d %{_libdir}/seamonkey/plugins libswfdecmozilla.so + +%triggerun -n browser-plugin-%{name} -- seamonkey +%nsplugin_uninstall -d %{_libdir}/seamonkey/plugins libswfdecmozilla.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-swfdec +%nsplugin_install -f -d %{_libdir}/mozilla/plugins libswfdecmozilla.so + %files %defattr(644,root,root,755) %doc TODO README Change* @@ -161,9 +215,9 @@ %endif %if %{with gstreamer} -%files -n mozilla-plugin-%{name} +%files -n browser-plugin-%{name} %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/mozilla/plugins/libswfdecmozilla.so +%attr(755,root,root) %{_plugindir}/libswfdecmozilla.so %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -172,6 +226,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.37.2.2 2006/05/04 23:32:10 glen +- use browser plugins, rel 2 + Revision 1.37.2.1 2006/05/04 22:19:40 glen - correct macro parsing ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/swfdec.spec?r1=1.37.2.1&r2=1.37.2.2&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit