[djvulibre] 3.5.34

[Peter Robinson]

commit 05551df3ce18552a7e3e70c66f07bb1f9192fb1a
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Aug 8 13:26:56 2011 +0100

    3.5.34

 .gitignore     |    1 +
 djvulibre.spec |   61 +++++++++++++++++--------------------------------------
 sources        |    2 +-
 3 files changed, 21 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5cf102f..ba37098 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 djvulibre-3.5.22.tar.gz
+/djvulibre-3.5.24.tar.gz
diff --git a/djvulibre.spec b/djvulibre.spec
index 255ff81..b29f63b 100644
--- a/djvulibre.spec
+++ b/djvulibre.spec
@@ -1,19 +1,21 @@
 Summary: DjVu viewers, encoders, and utilities
 Name: djvulibre
-Version: 3.5.22
-Release: 2%{?dist}
+Version: 3.5.24
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Publishing
 URL: http://djvu.sourceforge.net/
 Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz
 Patch0: djvulibre-3.5.22-cdefs.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires(post): xdg-utils, /sbin/ldconfig
+
+Requires(post): xdg-utils
 Requires(preun): xdg-utils
-BuildRequires: libjpeg-devel
+BuildRequires: libjpeg-turbo-devel
 BuildRequires: libtiff-devel
-BuildRequires: qt3-devel
-BuildRequires: xdg-utils, chrpath
+BuildRequires: xdg-utils chrpath
+
+Provides: %{name}-mozplugin = %{version}
+Obsoletes: %{name}-mozplugin < 3.5.24
 
 %description
 DjVu is a web-centric format and software platform for distributing documents
@@ -37,17 +39,6 @@ Group: System Environment/Libraries
 Library files for DjVuLibre.
 
 
-%package mozplugin
-Summary: Mozilla plugin for DjVuLibre
-Group: Applications/Internet
-Provides: mozilla-djvulibre = %{version}-%{release}
-# The plugin isn't library based, it seems to fork the viewer application
-Requires: %{name} = %{version}-%{release}
-
-%description mozplugin
-Mozilla plugin for DjVuLibre.
-
-
 %package devel
 Summary: Development files for DjVuLibre
 Group: Development/Libraries
@@ -62,29 +53,19 @@ Development files for DjVuLibre.
 %setup -q
 %patch0 -p1 -b .cdefs
 
-# Convert ISO8859-1 ja man pages to UTF-8 (still as of 3.5.20-2)
-#for manpage in i18n/ja/*.1*; do
-#    iconv -f iso8859-1 -t utf-8 -o tmp ${manpage}
-#    mv tmp ${manpage}
-#done
-
 
-%build
+%build 
 %configure --with-qt=%{_libdir}/qt-3.3 --enable-threads
 # Disable rpath on 64bit - NOT! It makes the build fail (still as of 3.5.20-2)
 #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.20-2
-%{__make} OPTS="%{optflags}"
+
+#%{__make} OPTS="%{optflags}"
+make %{?_smp_mflags} V=1
 
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
-# Move plugin from the netscape directory to the main mozilla one
-%{__mkdir_p} %{buildroot}%{_libdir}/mozilla/plugins/
-%{__mv} %{buildroot}%{_libdir}/netscape/plugins/nsdejavu.so \
-        %{buildroot}%{_libdir}/mozilla/plugins/nsdejavu.so
+make install DESTDIR=%{buildroot}
 
 # Fix for the libs to get stripped correctly (still required in 3.5.20-2)
 find %{buildroot}%{_libdir} -name '*.so*' | xargs %{__chmod} +x
@@ -104,16 +85,11 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/cpaldjvu
 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvuextract
 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/c44
 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvups
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djview3
 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvudump
 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvmcvt
 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/bzz
 
 
-%clean
-%{__rm} -rf %{buildroot}
-
-
 %post
 # Menu entry (icons and desktop file)
 %{_datadir}/djvu/djview3/desktop/register-djview-menu install || :
@@ -147,10 +123,6 @@ fi
 %doc README COPYRIGHT COPYING NEWS TODO
 %{_libdir}/*.so.*
 
-%files mozplugin
-%defattr(-,root,root,-)
-%{_libdir}/mozilla/plugins/nsdejavu.so
-
 %files devel
 %defattr(-,root,root,-)
 %doc doc/*.*
@@ -161,6 +133,11 @@ fi
 
 
 %changelog
+* Mon Aug  8 2011 Peter Robinson <pbrobinson at gmail.com> 3.5.24-1
+- 3.5.24
+- Obsolete mozplugin, dropped upstream
+- Dropped djview3, use djview4
+
 * Mon Jan 31 2011 Karsten Hopp <karsten at redhat.com> 3.5.22-2
 - add include cstddefs for size_t
 
diff --git a/sources b/sources
index c756841..f04416a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d1513784ce0e4f37d71595dc34c95ec7  djvulibre-3.5.22.tar.gz
+af83d27af5083198432a178d22b259c5  djvulibre-3.5.24.tar.gz