X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdjvulibre.git;a=blobdiff_plain;f=djvulibre.spec;h=1cb7a525b32e21c7736180386d999b9defff0543;hp=f0bb26ec363140bc222a836d6d98683336d1d946;hb=dd69650c4be73002130af493f2aefcfb8ce5ca2f;hpb=5574c66b9456f921f96c243916e7f3d22dfdff98

diff --git a/djvulibre.spec b/djvulibre.spec
index f0bb26e..1cb7a52 100644
--- a/djvulibre.spec
+++ b/djvulibre.spec
@@ -1,26 +1,28 @@
+# Conditional build:
+%bcond_without	qt	# disable qt wrapper
+#
 Summary:	DjVu viewers, encoders and utilities
 Summary(pl):	DjVu - przegl±darki, dekodery oraz narzêdzia
 Name:		djvulibre
-Version:	3.5.9
-Release:	2
+Version:	3.5.17
+Release:	4
 License:	GPL
 Group:		Applications/Graphics
-Source0:	ftp://ftp.sourceforge.net/pub/sourceforge/djvu/%{name}-%{version}.tar.gz
-Patch0:		%{name}-DESTDIR.patch
-Patch1:		%{name}-opt.patch
-Patch2:		%{name}-nostrip.patch
+Source0:	http://dl.sourceforge.net/djvu/%{name}-%{version}.tar.gz
+# Source0-md5:	18e71eec1f7d59ef4710b405ea64650e
+Patch0:		%{name}-opt.patch
+Patch1:		%{name}-nostrip.patch
+Patch2:		%{name}-desktop.patch
 URL:		http://djvu.sourceforge.net/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	libjpeg-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	qt-devel >= 3.0.5
+%{?with_qt:BuildRequires:	qt-devel >= 3.0.5}
+BuildRequires:	rpmbuild(macros) >= 1.357
 Obsoletes:	djvu
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		mozdir		/usr/lib/mozilla/plugins
-%define		nsdir		/usr/lib/netscape/plugins
-
 %description
 DjVu is a web-centric format and software platform for distributing
 documents and images. DjVu content downloads faster, displays and
@@ -65,18 +67,32 @@ 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.
+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
+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 devel
+Summary:	Header file for DjVu library
+Summary(pl):	Plik nag³ówkowy biblioteki DjVu
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	libjpeg-devel
+Requires:	libstdc++-devel
+
+%description devel
+Header file for DjVu library.
+
+%description devel -l pl
+Plik nag³ówkowy biblioteki DjVu.
+
 %package djview
 Summary:	Qt-based DjVu viewer
 Summary(pl):	Oparta o Qt przegl±darka DjVu
 Group:		X11/Applications
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 Obsoletes:	djview
 
 %description djview
@@ -85,60 +101,58 @@ 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
+%package -n browser-plugin-%{name}
+Summary:	DjVu browser plugin
+Summary(pl):	Wtyczka DjVu do przegl±derek WWW
 Group:		X11/Libraries
-Requires:	%{name}-djview = %{version}
-Requires:	netscape-common
+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
+# for migrate purposes (greedy poldek upgrade)
+Provides:	mozilla-plugin-djvulibre
+Provides:	netscape-plugin-djvulibre
 
-%description -n netscape-plugin-%{name}
-DjVu plugin for Netscape.
+%description -n browser-plugin-%{name}
+DjVu plugin for Mozilla and Mozilla-based browsers.
 
-%description -n netscape-plugin-%{name} -l pl
-Wtyczka DjVu do Netscape.
+%description -n browser-plugin-%{name} -l pl
+Wtyczka DjVu do przegl±darek zgodnych z Mozill±.
 
-%prep -q
+%prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 
 %build
-%{__aclocal}
+cp -f /usr/share/automake/config.sub config
+%{__aclocal} -I config -I gui/desktop
 %{__autoconf}
-# there are aliasing violations at least at libdjvu/BSByteStream.cpp:356-357,
-# so -fno-strict-aliasing must be passed
-CXXFLAGS="%{rpmcflags} -fno-strict-aliasing"
-%configure
+export QT_LIBS="-L%{_libdir} -lqt-mt"
+export QT_CFLAGS="-I%{_includedir}/qt"
+%configure \
+	PTHREAD_LIBS="-lpthread"
 
-%{__make} depend
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{mozdir},%{nsdir}}
+install -d $RPM_BUILD_ROOT%{_browserpluginsdir}
 
+# pass dtop_* to allow build w/o gnome/kde/etc. installed
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-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}
+	DESTDIR=$RPM_BUILD_ROOT \
+	plugindir=%{_browserpluginsdir} \
+	dtop_applications=%{_desktopdir} \
+	dtop_icons=%{_iconsdir} \
+	dtop_mimelnk=%{_datadir}/mimelnk \
+	dtop_applnk= \
+	dtop_pixmaps=%{_pixmapsdir} \
+	dtop_mime_info= \
+	dtop_application_registry=
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -146,34 +160,59 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
+%post -n browser-plugin-%{name}
+%update_browser_plugins
+
+%postun -n browser-plugin-%{name}
+if [ "$1" = 0 ]; then
+	%update_browser_plugins
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc COPYRIGHT NEWS README TODO doc/*
 %attr(755,root,root) %{_bindir}/[!d]*
 %attr(755,root,root) %{_bindir}/d[!j]*
 %attr(755,root,root) %{_bindir}/djv[!i]*
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_mandir}/man1/[!d]*
+%attr(755,root,root) %{_libdir}/libdjvulibre.so.*.*.*
+%{_mandir}/man1/[!dn]*
 %{_mandir}/man1/d[!j]*
 %{_mandir}/man1/djv[!i]*
+%lang(ja) %{_mandir}/ja/man1/[!dn]*
+%lang(ja) %{_mandir}/ja/man1/d[!j]*
+%lang(ja) %{_mandir}/ja/man1/djv[!i]*
 %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
+%lang(de) %{_datadir}/djvu/osi/de
 %{_datadir}/djvu/osi/en
-%lang(fr) %{_datadir}/djvu/osi/fr_FR
-%lang(ja) %{_datadir}/djvu/osi/ja_JP
+%lang(fr) %{_datadir}/djvu/osi/fr
+%lang(ja) %{_datadir}/djvu/osi/ja
+%lang(zh) %{_datadir}/djvu/osi/zh
+%{_datadir}/djvu/pubtext
 
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libdjvulibre.so
+%{_libdir}/libdjvulibre.la
+%{_includedir}/libdjvu
+%{_pkgconfigdir}/*.pc
+
+%if %{with qt}
 %files djview
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/djview
 %{_mandir}/man1/djview.1*
-
-%files -n mozilla-plugin-%{name}
-%defattr(644,root,root,755)
-%attr(755,root,root) %{mozdir}/*.so
-
-%files -n netscape-plugin-%{name}
+%lang(ja) %{_mandir}/ja/man1/djview.1*
+# don't include here - conflicts with kdelibs
+# %{_datadir}/mimelnk/image/x-djvu.desktop
+%{_desktopdir}/djview.desktop
+%{_iconsdir}/hicolor/*/mimetypes/djvu.png
+%{_pixmapsdir}/djvu.png
+
+%files -n browser-plugin-%{name}
 %defattr(644,root,root,755)
-%attr(755,root,root) %{nsdir}/*.so
+%attr(755,root,root) %{_browserpluginsdir}/*.so
+%{_mandir}/man1/nsdejavu.1*
+%lang(ja) %{_mandir}/ja/man1/nsdejavu.1*
+%endif