Update to 3.5.19 and try to fix multilib man page issue (#228359).

epel9
Matthias Saou 18 years ago
parent 57c15988c2
commit 86ff2dbc91

@ -1 +1 @@
djvulibre-3.5.18.tar.gz
djvulibre-3.5.19.tar.gz

@ -0,0 +1,162 @@
diff -Nupr djvulibre-3.5.18.orig/gui/nsdejavu/nsdejavu.1.in djvulibre-3.5.18/gui/nsdejavu/nsdejavu.1.in
--- djvulibre-3.5.18.orig/gui/nsdejavu/nsdejavu.1.in 2007-01-21 16:36:24.000000000 +0100
+++ djvulibre-3.5.18/gui/nsdejavu/nsdejavu.1.in 2007-02-13 13:46:34.000000000 +0100
@@ -29,7 +29,10 @@
nsdejavu \- DjVu browser plugin
.SH SYNOPSIS
-.B LIBDIR/netscape/plugins/NSDEJAVUSO
+.B /usr/lib/mozilla/plugins/NSDEJAVUSO
+or
+.br
+.B /usr/lib64/mozilla/plugins/NSDEJAVUSO
.SH DESCRIPTION
The shared library
@@ -205,48 +208,31 @@ tag:
.SH BROWSER COMPATIBILITY
The DjVu browser plugin has been tested with
several popular web browsers:
-.SS NETSCAPE 4
+.SS MOZILLA
+.PP
+The DjVuLibre plugin works nicely with Mozilla 0.9.5 or better.
.PP
-The DjVu browser plugin is normally installed in directory
-.BR /usr/local/lib/netscape/plugins .
-This is sufficient to enable the DjVu browser plugin
-because Netscape 4 always searches this directory for
-plugins.
-You might have to first remove previous version of the DjVuLibre plugin.
-Selecting menu
+Start
+.B mozilla
+and select menu
.B "Help->About Plugins"
-in
-.B netscape
-displays the current list of plugins.
-Previous versions of the plugin might be installed in one of
-the following locations:
-.IP "" 2
-.B "$HOME/.netscape/plugins/nsdejavu.so"
-.br
-.B "/usr/lib/netscape/plugins/nsdejavu.so"
-.br
-.B "/opt/netscape/plugins/nsdejavu.so"
+to check whether the DjVuLibre plugin is properly recognized.
.PP
-More complicated cases can be solved by creating a symbolic
-link into your personal plugin directory:
-.IP "" 2
-.B "cd $HOME/.netscape/plugins"
-.br
-.B "ln -s /usr/lib/netscape/plugins/nsdejavu.so ."
+.SS FIREFOX
+.PP
+The DjVuLibre plugin works nicely with Firefox or better.
.PP
-You must not copy
-.B nsdejavu.so
-but create a symbolic link. This is necessary
-because
-.B nsdejavu.so
-first locates its normal installation directory by following the symbolic
-link. The Netscape plugin search rules are explained in the
-.B README
-file that comes with the Netscape distribution.
-Also check option
-.B -fix
-of program
-.BR djview3 .
+Start
+.B firefox
+and enter the address
+.B "about:plugins"
+to check whether the DjVuLibre plugin is properly recognized.
+.PP
+.SS GALEON
+.PP
+Galeon internally uses the Mozilla rendering engine.
+If the plugin works for Mozilla, it should also
+work for Galeon.
.PP
.SS NETSCAPE 6
.PP
@@ -257,43 +243,13 @@ Let us assume that Netscape 6 is install
.IR /usr/local/netscape6 .
The following commands should do the trick:
.IP "" 2
-.BI "cd " "/usr/local/netscape6" "/plugins"
+.BI "cd " "/usr/local/netscape6/plugins"
.br
-.B "ln -s /usr/lib/netscape/plugins/nsdejavu.so ."
-.PP
-.SS MOZILLA
-.PP
-The DjVuLibre plugin works nicely with Mozilla 0.9.5 or better.
-You must establish a link from the Mozilla plugin directory.
-Assuming that Mozilla is installed under
-.IR /usr/lib/mozilla-1.1 :
-.IP "" 2
-.BI "cd " "/usr/lib/mozilla-1.1" "/plugins"
-.br
-.B "ln -s /usr/lib/netscape/plugins/nsdejavu.so ."
-.PP
-You can then restart
-.B mozilla
-and select menu
-.B "Help->About Plugins" to check
-whether the DjVuLibre plugin is properly recognized.
-.PP
-.SS GALEON
-.PP
-Galeon internally uses the Mozilla rendering engine.
-Install the plugin for Mozilla and it should also
-work for Galeon.
-.PP
-.SS FIREFOX
-.PP
-The DjVuLibre plugin works nicely with Firefox or better.
-You must establish a link from the Firefox plugin directory.
-Assuming that Firefox is installed under
-.IR /usr/lib/mozilla-firefox :
-.IP "" 2
-.BI "cd " "/usr/lib/mozilla-firefox" "/plugins"
+.B "ln -s /usr/lib/mozilla/plugins/nsdejavu.so ."
.br
-.B "ln -s /usr/lib/netscape/plugins/nsdejavu.so ."
+( or
+.B "ln -s /usr/lib64/mozilla/plugins/nsdejavu.so ."
+)
.PP
.SS KONQUEROR
.PP
@@ -308,8 +264,10 @@ In Konqueror, select
When the dialog appears, select the icon
.BR "Netscape Plugins" .
Make sure that directory
-.B "/usr/lib/netscape/plugins"
-appears in the list of plugin directories.
+.B "/usr/lib/mozilla/plugins"
+(or
+.B "/usr/lib64/mozilla/plugins"
+) appears in the list of plugin directories.
Then press button
.BR "Scan for new plugins" .
Clicking the
diff -Nupr djvulibre-3.5.18.orig/i18n/ja/nsdejavu.1.in djvulibre-3.5.18/i18n/ja/nsdejavu.1.in
--- djvulibre-3.5.18.orig/i18n/ja/nsdejavu.1.in 2003-11-18 16:01:57.000000000 +0100
+++ djvulibre-3.5.18/i18n/ja/nsdejavu.1.in 2007-02-13 13:32:26.000000000 +0100
@@ -27,7 +27,10 @@
nsdejavu \- DjVu ブラウザプラグイン
.SH 書式
-.B LIBDIR/netscape/plugins/NSDEJAVUSO
+.B /usr/lib/mozilla/plugins/NSDEJAVUSO
+.br
+or
+.B /usr/lib64/mozilla/plugins/NSDEJAVUSO
.SH 説明
共有ライブラリ

@ -1,18 +1,17 @@
Summary: DjVu viewers, encoders, utilities and web browser plugin
Name: djvulibre
Version: 3.5.18
Version: 3.5.19
Release: 1%{?dist}
License: GPL
Group: Applications/Publishing
URL: http://djvu.sourceforge.net/
Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz
Patch0: djvulibre-3.5.18-plugin-manpage.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires(post): xdg-utils, /sbin/ldconfig
Requires(preun): xdg-utils
BuildRequires: qt-devel, libjpeg-devel, libtiff-devel
BuildRequires: xdg-utils
# Virtual provides... might be worth splitting out for multilib, but then we'd
# probably need a separate -libs package to have 64bit tools and 32bit plugin
Provides: mozilla-djvulibre = %{version}-%{release}
%description
@ -38,11 +37,22 @@ Development files for djvulibre.
%prep
%setup
%setup -q
%patch0 -p1 -b .plugin-manpage
# Remove leftover file (since we include the dir as %%doc)
%{__rm} -f doc/minilisp/.cvsignore
# Convert ISO8859-1 ja man pages to UTF-8 (still as of 3.5.19)
for manpage in i18n/ja/*.1*; do
iconv -f iso8859-1 -t utf-8 -o tmp ${manpage}
mv tmp ${manpage}
done
%build
%configure
# Disable rpath on 64bit - NOT! It makes the build fail (3.5.19)
#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
# In 3.5.14 %{?_smp_mflags} broke the build - still in 3.5.18
%{__make} OPTS="%{optflags}"
@ -83,7 +93,7 @@ fi
%files
%defattr(-, root, root, 0755)
%defattr(-,root,root,-)
%doc README COPYRIGHT COPYING NEWS TODO doc/
%{_bindir}/*
%{_libdir}/*.so.*
@ -95,7 +105,7 @@ fi
%lang(ja) %{_mandir}/ja/man1/*
%files devel
%defattr(-, root, root, 0755)
%defattr(-,root,root,-)
%{_includedir}/libdjvu/
%{_libdir}/pkgconfig/ddjvuapi.pc
%exclude %{_libdir}/*.la
@ -103,6 +113,14 @@ fi
%changelog
* Fri Jun 8 2007 Matthias Saou <http://freshrpms.net/> 3.5.19-1
- Update to 3.5.19.
- Disable rpath on 64bit... not.
- Convert ja man pages to UTF-8.
* Tue Feb 13 2007 Matthias Saou <http://freshrpms.net/> 3.5.18-2
- Include man page patch to have man pages be identical across archs (#228359).
* Mon Feb 5 2007 Matthias Saou <http://freshrpms.net/> 3.5.18-1
- Update to 3.5.18.
- Remove no longer needed /usr/include/qt3 replacing.
@ -176,7 +194,7 @@ fi
- Added new Japanese man pages.
* Wed May 5 2004 Matthias Saou <http://freshrpms.net/> 3.5.12-4
- Changed the plugin directory for mozilla to %{_libdir}/mozilla,
- Changed the plugin directory for mozilla to %%{_libdir}/mozilla,
as suggested by Matteo Corti.
- Shortened the description.

@ -1 +1 @@
73fd6d4f92832b85a91529b7bb3b7710 djvulibre-3.5.18.tar.gz
0330d87ad337e408e21e1018eb511839 djvulibre-3.5.19.tar.gz

Loading…
Cancel
Save