Author: glen Date: Wed Jan 10 17:42:45 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - browser plugins v2; rel 4
---- Files affected: SPECS: djvulibre.spec (1.51 -> 1.52) ---- Diffs: ================================================================ Index: SPECS/djvulibre.spec diff -u SPECS/djvulibre.spec:1.51 SPECS/djvulibre.spec:1.52 --- SPECS/djvulibre.spec:1.51 Mon Oct 30 19:07:20 2006 +++ SPECS/djvulibre.spec Wed Jan 10 18:42:40 2007 @@ -1,7 +1,4 @@ # $Revision$, $Date$ -# TODO -# - test and add other browsers -# # Conditional build: %bcond_without qt # disable qt wrapper # @@ -9,7 +6,7 @@ Summary(pl): DjVu - przeglądarki, dekodery oraz narzędzia Name: djvulibre Version: 3.5.17 -Release: 3 +Release: 4 License: GPL Group: Applications/Graphics Source0: http://dl.sourceforge.net/djvu/%{name}-%{version}.tar.gz @@ -23,15 +20,10 @@ BuildRequires: libjpeg-devel BuildRequires: libstdc++-devel %{?with_qt:BuildRequires: qt-devel >= 3.0.5} -BuildRequires: rpmbuild(macros) >= 1.236 +BuildRequires: rpmbuild(macros) >= 1.357 Obsoletes: djvu BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _plugindir %{_libdir}/browser-plugins - -# list of supported browsers, in free form text -%define browsers mozilla, mozilla-firefox, mozilla-firefox-bin, netscape, seamonkey - %description DjVu is a web-centric format and software platform for distributing documents and images. DjVu content downloads faster, displays and @@ -115,10 +107,11 @@ Summary(pl): Wtyczka DjVu do przegląderek WWW Group: X11/Libraries Requires: %{name}-djview = %{version}-%{release} +Requires: browser-plugins >= 2.0 Requires: browser-plugins(%{_target_base_arch}) +Obsoletes: djview-netscape Obsoletes: mozilla-plugin-djvulibre Obsoletes: netscape-plugin-djvulibre -Obsoletes: djview-netscape # for migrate purposes (greedy poldek upgrade) Provides: mozilla-plugin-djvulibre Provides: netscape-plugin-djvulibre @@ -126,13 +119,9 @@ %description -n browser-plugin-%{name} DjVu plugin for Mozilla and Mozilla-based browsers. -Supported browsers: %{browsers}. - %description -n browser-plugin-%{name} -l pl Wtyczka DjVu do przeglądarek zgodnych z Mozillą. -Obsługiwane przeglądarki: %{browsers}. - %prep %setup -q %patch0 -p1 @@ -143,8 +132,8 @@ cp -f /usr/share/automake/config.sub config %{__aclocal} -I config -I gui/desktop %{__autoconf} -QT_LIBS="-L%{_libdir} -lqt-mt"; export QT_LIBS -QT_CFLAGS="-I%{_includedir}/qt"; export QT_CFLAGS +export QT_LIBS="-L%{_libdir} -lqt-mt" +export QT_CFLAGS="-I%{_includedir}/qt" %configure \ PTHREAD_LIBS="-lpthread" @@ -152,12 +141,12 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_plugindir} +install -d $RPM_BUILD_ROOT%{_browserpluginsdir} # pass dtop_* to allow build w/o gnome/kde/etc. installed %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ - plugindir=%{_plugindir} \ + plugindir=%{_browserpluginsdir} \ dtop_applications=%{_desktopdir} \ dtop_icons=%{_iconsdir} \ dtop_mimelnk=%{_datadir}/mimelnk \ @@ -172,43 +161,13 @@ %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%triggerin -n browser-plugin-%{name} -- mozilla -%nsplugin_install -d %{_libdir}/mozilla/plugins nsdejavu.so - -%triggerun -n browser-plugin-%{name} -- mozilla -%nsplugin_uninstall -d %{_libdir}/mozilla/plugins nsdejavu.so - -%triggerin -n browser-plugin-%{name} -- mozilla-firefox -%nsplugin_install -d %{_libdir}/mozilla-firefox/plugins nsdejavu.so +%post -n browser-plugin-%{name} +%update_browser_plugins -%triggerun -n browser-plugin-%{name} -- mozilla-forefox -%nsplugin_uninstall -d %{_libdir}/mozilla-firefox/plugins nsdejavu.so - -%triggerin -n browser-plugin-%{name} -- mozilla-firefox-bin -%nsplugin_install -d %{_libdir}/mozilla-firefox-bin/plugins nsdejavu.so - -%triggerun -n browser-plugin-%{name} -- mozilla-forefox-bin -%nsplugin_uninstall -d %{_libdir}/mozilla-firefox-bin/plugins nsdejavu.so - -%triggerin -n browser-plugin-%{name} -- netscape-common -%nsplugin_install -d %{_libdir}/netscape/plugins nsdejavu.so - -%triggerun -n browser-plugin-%{name} -- netscape-common -%nsplugin_uninstall -d %{_libdir}/netscape/plugins nsdejavu.so - -%triggerin -n browser-plugin-%{name} -- seamonkey -%nsplugin_install -d %{_libdir}/seamonkey/plugins nsdejavu.so - -%triggerun -n browser-plugin-%{name} -- seamonkey -%nsplugin_uninstall -d %{_libdir}/seamonkey/plugins nsdejavu.so - -# as rpm removes the old obsoleted package files after the triggers -# are ran, add another trigger to make the links there. -%triggerpostun -n browser-plugin-%{name} -- mozilla-plugin-%{name} -%nsplugin_install -f -d %{_libdir}/mozilla/plugins nsdejavu.so - -%triggerpostun -n browser-plugin-%{name} -- netscape-plugin-%{name} -%nsplugin_install -f -d %{_libdir}/netscape/plugins nsdejavu.so +%postun -n browser-plugin-%{name} +if [ "$1" = 0 ]; then + %update_browser_plugins +fi %files %defattr(644,root,root,755) @@ -254,7 +213,7 @@ %files -n browser-plugin-%{name} %defattr(644,root,root,755) -%attr(755,root,root) %{_plugindir}/*.so +%attr(755,root,root) %{_browserpluginsdir}/*.so %{_mandir}/man1/nsdejavu.1* %lang(ja) %{_mandir}/ja/man1/nsdejavu.1* %endif @@ -265,6 +224,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.52 2007/01/10 17:42:40 glen +- browser plugins v2; rel 4 + Revision 1.51 2006/10/30 18:07:20 shadzik - support mozilla-firefox-bin; rel++ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/djvulibre.spec?r1=1.51&r2=1.52&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
