Author: glen                         Date: Thu Aug 11 22:39:11 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL: one package for all browsers using triggers

---- Files affected:
SPECS:
   gplflash.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/gplflash.spec
diff -u SPECS/gplflash.spec:1.5 SPECS/gplflash.spec:1.6
--- SPECS/gplflash.spec:1.5     Thu Feb 10 20:32:05 2005
+++ SPECS/gplflash.spec Fri Aug 12 00:39:06 2005
@@ -3,7 +3,7 @@
 Summary(pl):   Biblioteka renderująca animacje Flash
 Name:          gplflash
 Version:       0.4.13
-Release:       2
+Release:       2.4
 License:       GPL
 Group:         Libraries
 Source0:       http://dl.sourceforge.net/gplflash/%{name}-%{version}.tar.bz2
@@ -18,10 +18,13 @@
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
 BuildRequires: zlib-devel >= 1.1.4
+BuildRequires: rpmbuild(macros) >= 1.224
 BuildConflicts:        flash
 Obsoletes:     flash
 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
@@ -64,21 +67,34 @@
 %description static -l pl
 Statyczna biblioteka gplflash.
 
-%package -n mozilla-plugin-%{name}
-Summary:       Mozilla plugin for Flash rendering
+%package -n browser-plugin-%{name}
+Summary:       Browser plugin for Flash rendering
 Summary(pl):   Wtyczka Mozilli wuświetlająca animacje Flash
 Group:         X11/Libraries
 Requires:      %{name} = %{version}-%{release}
 Obsoletes:     mozilla-plugin-flash
+Obsoletes:     mozilla-plugin-gplflash
+Requires:      browser-plugins
+
+# use macro, otherwise extra LF isinserted 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 mozilla-plugin-%{name}
-Mozilla plugin for rendering of Flash animations based on gplflash
+%description -n browser-plugin-%{name}
+Browser plugin for rendering of Flash animations based on gplflash
 library.
 
-%description -n mozilla-plugin-%{name} -l pl
+Supported browsers: %{browsers}.
+
+%description -n browser-plugin-%{name} -l pl
 Wtyczka Mozilli wyświetlająca animacje Flash bazująca na bibliotece
 gplflash.
 
+Supported browsers: %{browsers}.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -90,7 +106,7 @@
 %{__autoconf}
 %{__automake}
 %configure \
-       --with-plugin-dir=%{_libdir}/mozilla/plugins \
+       --with-plugin-dir=%{_plugindir} \
        --enable-shared \
        --enable-static
 %{__make}
@@ -101,12 +117,41 @@
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# include in -devel and -static instead?
+rm -f $RPM_BUILD_ROOT%{_libdir}/browser-plugins/libnpflash.{l,}a
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %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
+%nsplugin_install -d %{_libdir}/mozilla/plugins libnpflash.so
+
+%triggerun -n browser-plugin-%{name} -- mozilla
+%nsplugin_uninstall -d %{_libdir}/mozilla/plugins libnpflash.so
+
+%ifarch %{ix86} ppc sparc sparc64
+%triggerin -n browser-plugin-%{name} -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
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README TODO
@@ -123,9 +168,9 @@
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
 
-%files -n mozilla-plugin-%{name}
+%files -n browser-plugin-%{name}
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/mozilla/plugins/lib*flash.so
+%attr(755,root,root) %{_plugindir}/libnpflash.so
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -133,6 +178,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/08/11 22:39:06  glen
+- merged from DEVEL: one package for all browsers using triggers
+
+Revision 1.5.2.1  2005/06/24 09:03:39  glen
+- use the triggers for browser plugins
+
 Revision 1.5  2005/02/10 19:32:05  qboosh
 - added link patch (fixes plugin linking); release 2
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to