- support mozilla-firefox-bin; rel++

[packages/djvulibre.git] / djvulibre.spec

diff --git a/djvulibre.spec b/djvulibre.spec
index d50a6d19f2582dec078a1cc5d1c4ea0053333388..152c13726aa6a13844f4f9c6c92cd074b96265cc 100644 (file)
--- a/djvulibre.spec
+++ b/djvulibre.spec
@@ -7,16 +7,15 @@
 Summary:       DjVu viewers, encoders and utilities
 Summary(pl):   DjVu - przegl±darki, dekodery oraz narzêdzia
 Name:          djvulibre
-Version:       3.5.16
-Release:       2
+Version:       3.5.17
+Release:       3
 License:       GPL
 Group:         Applications/Graphics
 Source0:       http://dl.sourceforge.net/djvu/%{name}-%{version}.tar.gz
-# Source0-md5: 5591c99a50aed1613a796a5aa4978fc0
+# Source0-md5: 18e71eec1f7d59ef4710b405ea64650e
 Patch0:                %{name}-opt.patch
 Patch1:                %{name}-nostrip.patch
 Patch2:                %{name}-desktop.patch
-Patch3:                %{name}-c++.patch
 URL:           http://djvu.sourceforge.net/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -30,7 +29,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _plugindir      %{_libdir}/browser-plugins
 
 # list of supported browsers, in free form text
-%define                browsers mozilla, netscape
+%define                browsers mozilla, mozilla-firefox, mozilla-firefox-bin, netscape, seamonkey
 
 %description
 DjVu is a web-centric format and software platform for distributing
@@ -115,7 +114,7 @@ Summary:    DjVu browser plugin
 Summary(pl):   Wtyczka DjVu do przegl±derek WWW
 Group:         X11/Libraries
 Requires:      %{name}-djview = %{version}-%{release}
-Requires:      browser-plugins(%{_target_cpu})
+Requires:      browser-plugins(%{_target_base_arch})
 Obsoletes:     mozilla-plugin-djvulibre
 Obsoletes:     netscape-plugin-djvulibre
 Obsoletes:     djview-netscape
@@ -138,7 +137,6 @@ Obs
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 cp -f /usr/share/automake/config.sub config
@@ -185,6 +183,12 @@ rm -rf $RPM_BUILD_ROOT
 %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
 
@@ -233,6 +237,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libdjvulibre.so
 %{_libdir}/libdjvulibre.la
 %{_includedir}/libdjvu
+%{_pkgconfigdir}/*.pc
 
 %if %{with qt}
 %files djview
@@ -240,7 +245,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/djview
 %{_mandir}/man1/djview.1*
 %lang(ja) %{_mandir}/ja/man1/djview.1*
-%{_datadir}/mimelnk/image/x-djvu.desktop
+# don't include here - conflicts with kdelibs
+# %{_datadir}/mimelnk/image/x-djvu.desktop
 %{_desktopdir}/djview.desktop
 %{_iconsdir}/hicolor/*/mimetypes/djvu.png
 %{_pixmapsdir}/djvu.png