Author: glen Date: Wed Jan 10 17:42:19 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - browser plugins v2; rel 4
---- Files affected: SPECS: gpac.spec (1.24 -> 1.25) ---- Diffs: ================================================================ Index: SPECS/gpac.spec diff -u SPECS/gpac.spec:1.24 SPECS/gpac.spec:1.25 --- SPECS/gpac.spec:1.24 Sat Dec 9 12:39:20 2006 +++ SPECS/gpac.spec Wed Jan 10 18:42:14 2007 @@ -1,5 +1,6 @@ # $Revision$, $Date$ -# TODO: soname for libm4systems(?) +# TODO +# - soname for libm4systems(?) # - use system mozilla includes # - ./configure[692]: wx-config: not found # - ./configure[693]: wx-config: not found @@ -22,7 +23,7 @@ Summary(pl): GPAC - implementacja standardu MPEG-4 Systems (ISO/IEC 14496-1) Name: gpac Version: 0.4.0 -Release: 3 +Release: 4 License: LGPL Group: Applications Source0: http://dl.sourceforge.net/gpac/%{name}-%{version}.tar.gz @@ -43,7 +44,7 @@ %{?with_mad:BuildRequires: libmad-devel} %{?with_png:BuildRequires: libpng-devel} BuildRequires: libxml2-devel -BuildRequires: rpmbuild(macros) >= 1.236 +BuildRequires: rpmbuild(macros) >= 1.357 %{?with_wx:BuildRequires: wxGTK2-devel >= 2.5.4} %{?with_xvid:BuildRequires: xvid-devel} Requires: SDL @@ -58,7 +59,6 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _noautoreq libm4systems.so -%define _plugindir %{_libdir}/browser-plugins %description GPAC is an implementation of the MPEG-4 Systems standard (ISO/IEC @@ -95,20 +95,15 @@ Summary(pl): Wtyczka GPAC do przegląderek WWW Group: X11/Libraries Requires: %{name} = %{version}-%{release} -Requires: browser-plugins(%{_target_cpu}) - -%define browsers mozilla, mozilla-firefox +Requires: browser-plugins >= 2.0 +Requires: browser-plugins(%{_target_base_arch}) %description -n browser-plugin-%{name} GPAC plugin for Netscape-compatible WWW browsers. -Supported browsers: %{browsers}. - %description -n browser-plugin-%{name} -l pl Wtyczka GPAC dla przeglądarek WWW zgodnych z Netscape. -Obsługiwane przeglądarki: %{browsers}. - %prep %setup -q -n %{name} %patch0 -p1 @@ -157,7 +152,7 @@ plugdir=$RPM_BUILD_ROOT%{_libdir}/gpac \ real_plugdir=%{_libdir}/gpac \ prefix=$RPM_BUILD_ROOT%{_prefix} \ - MOZILLA_DIR=$RPM_BUILD_ROOT%{_plugindir} + MOZILLA_DIR=$RPM_BUILD_ROOT%{_browserpluginsdir} %clean rm -rf $RPM_BUILD_ROOT @@ -165,36 +160,12 @@ %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%triggerin -n browser-plugin-%{name} -- mozilla-firefox -%nsplugin_install -d %{_libdir}/mozilla-firefox/plugins nposmozilla.so nposmozilla.xpt - -%triggerun -n browser-plugin-%{name} -- mozilla-firefox -%nsplugin_uninstall -d %{_libdir}/mozilla-firefox/plugins nposmozilla.so nposmozilla.xpt +%post -n browser-plugin-%{name} +%update_browser_plugins -%triggerin -n browser-plugin-%{name} -- mozilla-firefox-bin -%nsplugin_install -d %{_libdir}/mozilla-firefox-bin/plugins nposmozilla.so nposmozilla.xpt - -%triggerun -n browser-plugin-%{name} -- mozilla-firefox-bin -%nsplugin_uninstall -d %{_libdir}/mozilla-firefox-bin/plugins nposmozilla.so nposmozilla.xpt - -%triggerin -n browser-plugin-%{name} -- mozilla -%nsplugin_install -d %{_libdir}/mozilla/plugins nposmozilla.so nposmozilla.xpt -if [ -d /usr/%{_lib}/mozilla ]; then - 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 -fi - -%triggerun -n browser-plugin-%{name} -- mozilla -%nsplugin_uninstall -d %{_libdir}/mozilla/plugins nposmozilla.so nposmozilla.xpt -if [ -d /usr/%{_lib}/mozilla ]; then - 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 browser-plugin-%{name} +if [ "$1" = 0 ]; then + %update_browser_plugins fi %files @@ -208,8 +179,8 @@ %files -n browser-plugin-%{name} %defattr(644,root,root,755) -%attr(755,root,root) %{_plugindir}/nposmozilla.so -%{_plugindir}/nposmozilla.xpt +%attr(755,root,root) %{_browserpluginsdir}/nposmozilla.so +%{_browserpluginsdir}/nposmozilla.xpt %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -217,6 +188,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.25 2007/01/10 17:42:14 glen +- browser plugins v2; rel 4 + Revision 1.24 2006/12/09 11:39:20 glen - make -j1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gpac.spec?r1=1.24&r2=1.25&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
