- partially fixed, added opt patch

- subpackages with djview (requires X+qt) and plugins
- works for me except endless loop with QT warnings after closing SkipStone
  (works good with Mozilla and Light, so it may be SkipStone bug)

Changed files:
    djvulibre-opt.patch -> 1.1
    djvulibre.spec -> 1.2

diff --git a/djvulibre-opt.patch b/djvulibre-opt.patch
new file mode 100644 (file)
index 0000000..cc69d6e
--- /dev/null
+++ b/djvulibre-opt.patch
@@ -0,0 +1,39 @@
+--- djvulibre-3.5.5/config/acinclude.m4.orig   Thu Mar 21 17:43:46 2002
++++ djvulibre-3.5.5/config/acinclude.m4        Sat May 18 01:03:33 2002
+@@ -58,36 +58,6 @@
+         [ac_debug=$enableval],[ac_debug=no])
+    OPTS=
+    AC_SUBST(OPTS)
+-   saved_CXXFLAGS="$CXXFLAGS"
+-   saved_CFLAGS="$CFLAGS"
+-   CXXFLAGS=
+-   CFLAGS=
+-   for opt in $saved_CXXFLAGS ; do
+-     case $opt in
+-       -g*) test $ac_debug != no && OPTS="$OPTS $opt" ;;
+-       -O*) ;;
+-       *) CXXFLAGS="$CXXFLAGS $opt" ;;
+-     esac
+-   done
+-   for opt in $saved_CFLAGS ; do
+-     case $opt in
+-       -O*|-g*) ;;
+-       *) CFLAGS="$CFLAGS $opt" ;;
+-     esac
+-   done
+-   if test $ac_debug = no ; then
+-     OPTS=-DNO_DEBUG
+-     AC_CHECK_CXX_OPT([-Wall],[OPTS="$OPTS -Wall"])
+-     AC_CHECK_CXX_OPT([-O3],[OPTS="$OPTS -O3"],
+-        [ AC_CHECK_CXX_OPT([-O2], [OPTS="$OPTS -O2"] ) ] )
+-     AC_CHECK_CXX_OPT([-funroll-loops], [OPTS="$OPTS -funroll-loops"])
+-     case "${host_cpu}" in
+-        i?86)
+-           opt="-mcpu=${host_cpu}"
+-           AC_CHECK_CXX_OPT([$opt], [OPTS="$OPTS $opt"])
+-           ;;
+-      esac
+-   fi
+    case x"$ac_debug" in
+      x[0-9])  OPTS="$OPTS -DDEBUGLVL=$ac_debug" ;;
+      xr*)   OPTS="$OPTS -DRUNTIME_DEBUG_ONLY" ;;

diff --git a/djvulibre.spec b/djvulibre.spec
index c9e557932e9faa34fc21442e43b84878909598df..0fc1904f1a6878f0128decec463a71d73340dbe4 100644 (file)
--- a/djvulibre.spec
+++ b/djvulibre.spec
@@ -7,17 +7,22 @@ License:      GPL
 Group:         Applications/Graphics
 Source0:       http://prdownloads.sourceforge.net/djvu/%{name}-%{version}.tar.gz
 Patch0:                %{name}-DESTDIR.patch
+Patch1:                %{name}-opt.patch
+URL:           http://djvu.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libjpeg-devel
+BuildRequires: libstdc++-devel
 BuildRequires: qt-devel >= 2.2.0
-URL:           http://djvu.sourceforge.net
+Obsoletes:     djvu
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-#%define               _prefix         /usr/X11R6
+%define                _xbindir        /usr/X11R6/bin
+%define                _xmandir        /usr/X11R6/man
+%define                mozdir          /usr/X11R6/lib/mozilla/plugins
+%define                nsdir           /usr/X11R6/lib/netscape/plugins
 
 %description
-
 DjVu is a web-centric format and software platform for distributing
 documents and images. DjVu content downloads faster, displays and
 renders faster, looks nicer on a screen, and consume less client
@@ -25,7 +30,7 @@ resources than competing formats. DjVu was originally developped at
 AT&T Labs-Research by Leon Bottou, Yann LeCun, Patrick Haffner, and
 many others. In March 2000, AT&T sold DjVu to LizardTech Inc. who now
 distributes Windows/Mac plug-ins, and commercial encoders (mostly on
-Windows)
+Windows).
 
 In an effort to promote DjVu as a Web standard, the LizardTech
 management was enlightened enough to release the reference
@@ -34,9 +39,7 @@ implementation of DjVu under the GNU GPL in October 2000. DjVuLibre
 maintained by the original inventors of DjVu. It is compatible with
 version 3.5 of the LizardTech DjVu software suite.
 
-DjVulibre-3.5 contains:
-- a standalone DjVu viewer based on the Qt library.
-- A browser plugin that works with most Unix browsers.
+This package of DjVulibre 3.5 contains:
 - A full-fledged wavelet-based compressor for pictures.
 - A simple compressor for bitonal (black and white) scanned pages.
 - A compressor for palettized images (a la GIF/PNG).
@@ -45,40 +48,132 @@ DjVulibre-3.5 contains:
 - A set of decoders to convert DjVu to a number of other formats.
 - An up-to-date version of the C++ DjVu Reference Library.
 
+Following elements are placed in other subpackages:
+- a standalone DjVu viewer based on the Qt library.
+- A browser plugin that works with most Unix browsers.
+
+%description -l pl
+DjVu jest przeznaczonym g³ównie dla WWW formatem i platform±
+programow± do dystrybucji dokumentów i obrazków. Dane w DjVu ¶ci±gaj±
+siê szybciej, wy¶wietlaj± szybciej, wygl±daj± ³adniej na ekranie i
+zajmuj± mniej zasobów po stronie klienckiej ni¿ inne formaty. DjVu
+oryginalnie zosta³ stworzony w AT&T Labs-Research przez Leona Bottou,
+Yanna LeCun, Patricka Haffnera i wielu innych. W marcu 2000 AT&T
+sprzeda³o DjVu firmie LizardTech Inc., które teraz rozpowszechnia
+wtyczki dla Windows i Maca oraz komercyjne kodery (g³ównie dla
+Windows).
+
+Aby wypromowaæ DjVu jako sieciowy standard, LizardTech udostêpni³
+wzorcow± implementacjê DjVu na licencji GPL w pa¼dzierniku 2000.
+DjVuLibre (czyli wolne DjVu) jest rozszerzon± wersj± tego kodu
+rozwijan± przez pomys³odawców DjVu. Jest kompatybilna z wersj±
+3.5 oprogramowania LizardTech DjVu.
+
+Ten pakiet zawiera: bibliotekê w C++, zestaw kompresorów, dekoderów
+i narzêdzi do plików w formacie DjVu. Przegl±darka oraz wtyczki do
+przegl±darek znajduj± siê w innych podpakietach.
+
+%package djview
+Summary:       Qt-based DjVu viewer
+Summary(pl):   Oparta o Qt przegl±darka DjVu
+Group:         X11/Applications
+Requires:      %{name} = %{version}
+Obsoletes:     djview
+
+%description djview
+Qt-based DjVu viewer.
+
+%description djview -l pl
+Oparta o Qt przegl±darka DjVu.
+
+%package -n mozilla-plugin-%{name}
+Summary:       DjVu plugin for Mozilla
+Summary(pl):   Wtyczka DjVu do Mozilli
+Group:         X11/Libraries
+Requires:      %{name}-djview = %{version}
+Requires:      mozilla-embedded
+
+%description -n mozilla-plugin-%{name}
+DjVu plugin for Mozilla and Mozilla-based browsers.
+
+%description -n mozilla-plugin-%{name} -l pl
+Wtyczka DjVu do Mozilli i przegl±darek na niej bazuj±cych.
+
+%package -n netscape-plugin-%{name}
+Summary:       DjVu plugin for Netscape
+Summary(pl):   Wtyczka DjVu do Netscape
+Group:         X11/Libraries
+Requires:      %{name}-djview = %{version}
+Requires:      netscape-common
+Obsoletes:     djview-netscape
+
+%description -n netscape-plugin-%{name}
+DjVu plugin for Netscape.
+
+%description -n netscape-plugin-%{name} -l pl
+Wtyczka DjVu do Netscape.
+
 %prep -q
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 aclocal
 autoconf
 %configure
-make depend
-make
 
-gzip -9nf README INSTALL NEWS TODO
+%{__make} depend
+%{__make}
+
+gzip -9nf README NEWS TODO doc/*.txt
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
+install -d $RPM_BUILD_ROOT{%{_xbindir},%{_xmandir}/man1,%{mozdir},%{nsdir}}
+
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
+mv -f $RPM_BUILD_ROOT%{_bindir}/djview \
+       $RPM_BUILD_ROOT%{_xbindir}
+mv -f $RPM_BUILD_ROOT%{_mandir}/man1/djview.1 \
+       $RPM_BUILD_ROOT%{_xmandir}/man1
 
-cd $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins && ln -sf ../../netscape/plugins/nsdejavu.so .
+mv -f $RPM_BUILD_ROOT%{_libdir}/netscape/plugins/nsdejavu.so \
+       $RPM_BUILD_ROOT%{mozdir}
+cp -f $RPM_BUILD_ROOT%{mozdir}/nsdejavu.so $RPM_BUILD_ROOT%{nsdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
 %doc *.gz doc/*
 %attr(755,root,root) %{_bindir}/*
-%{_libdir}
-%{_datadir}/djvu
-%{_mandir}
+%{_libdir}/lib*.so
+%{_mandir}/man1/*
+%dir %{_datadir}/djvu
+%{_datadir}/djvu/languages.xml
+%dir %{_datadir}/djvu/osi
+%lang(zh) %{_datadir}/djvu/osi/Chinese_PRC
+%lang(de) %{_datadir}/djvu/osi/de_DE
+%{_datadir}/djvu/osi/en
+%lang(fr) %{_datadir}/djvu/osi/fr_FR
+%lang(ja) %{_datadir}/djvu/osi/ja_JP
+
+%files djview
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_xbindir}/djview
+%{_xmandir}/man1/djview.1*
+
+%files -n mozilla-plugin-%{name}
+%defattr(644,root,root,755)
+%attr(755,root,root) %{mozdir}/*.so
+
+%files -n netscape-plugin-%{name}
+%defattr(644,root,root,755)
+%attr(755,root,root) %{nsdir}/*.so