From 751593acb095b24db999b3304ebf9a07581b36fa Mon Sep 17 00:00:00 2001 From: Rakesh Pandit Date: Thu, 3 Dec 2009 08:15:58 +0000 Subject: [PATCH] Updated to 3.5.22 --- .cvsignore | 2 +- djvulibre-3.5.18-plugin-manpage.patch | 162 -------------------------- djvulibre-3.5.19-ja-encoding.patch | 11 -- djvulibre-configure.patch | 10 -- djvulibre.spec | 46 +++++--- import.log | 1 + sources | 2 +- 7 files changed, 35 insertions(+), 199 deletions(-) delete mode 100644 djvulibre-3.5.18-plugin-manpage.patch delete mode 100644 djvulibre-3.5.19-ja-encoding.patch delete mode 100644 djvulibre-configure.patch diff --git a/.cvsignore b/.cvsignore index f07c377..5cf102f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -djvulibre-3.5.21.tar.gz +djvulibre-3.5.22.tar.gz diff --git a/djvulibre-3.5.18-plugin-manpage.patch b/djvulibre-3.5.18-plugin-manpage.patch deleted file mode 100644 index 45294c6..0000000 --- a/djvulibre-3.5.18-plugin-manpage.patch +++ /dev/null @@ -1,162 +0,0 @@ -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 説明 - 共有ライブラリ diff --git a/djvulibre-3.5.19-ja-encoding.patch b/djvulibre-3.5.19-ja-encoding.patch deleted file mode 100644 index d7f3ae9..0000000 --- a/djvulibre-3.5.19-ja-encoding.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naupr djvulibre-3.5.19.orig/i18n/ja/Makefile.in djvulibre-3.5.19/i18n/ja/Makefile.in ---- djvulibre-3.5.19.orig/i18n/ja/Makefile.in 2007-03-25 22:48:29.000000000 +0200 -+++ djvulibre-3.5.19/i18n/ja/Makefile.in 2007-06-11 13:59:52.000000000 +0200 -@@ -53,7 +53,6 @@ install: install-man - - # Rules - nsdejavu.1: ${srcdir}/nsdejavu.1.in -- LC_CTYPE=ja_JP.eucjp \ - sed < ${srcdir}/nsdejavu.1.in > nsdejavu.1 \ - -e 's,LIBDIR,${libdir},' -e 's,NSDEJAVUSO,${NSDEJAVU},' - diff --git a/djvulibre-configure.patch b/djvulibre-configure.patch deleted file mode 100644 index 915f1a3..0000000 --- a/djvulibre-configure.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- djvulibre-3.5.21.org/configure 2009-01-16 20:59:06.000000000 +0530 -+++ djvulibre-3.5.21/configure 2009-01-16 20:57:27.000000000 +0530 -@@ -21691,6 +21691,7 @@ - __sync_lock_test_and_set(&l,1); - __sync_lock_release(&l); - __sync_add_and_fetch(&l,1); -+ __sync_bool_compare_and_swap(&l,&l,1); - return 0; - ; - return 0; diff --git a/djvulibre.spec b/djvulibre.spec index c5f7238..46da09d 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,21 +1,18 @@ Summary: DjVu viewers, encoders, and utilities Name: djvulibre -Version: 3.5.21 -Release: 3%{?dist} +Version: 3.5.22 +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.18-plugin-manpage.patch -Patch1: djvulibre-3.5.19-ja-encoding.patch -Patch2: djvulibre-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires(post): xdg-utils, /sbin/ldconfig Requires(preun): xdg-utils BuildRequires: libjpeg-devel BuildRequires: libtiff-devel BuildRequires: qt3-devel -BuildRequires: xdg-utils +BuildRequires: xdg-utils, chrpath %description DjVu is a web-centric format and software platform for distributing documents @@ -62,18 +59,16 @@ Development files for DjVuLibre. %prep %setup -q -%patch0 -p1 -b .plugin-manpage -%patch1 -p1 -b .ja-encoding -%patch2 -p1 -b .configure + # 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 +#for manpage in i18n/ja/*.1*; do +# iconv -f iso8859-1 -t utf-8 -o tmp ${manpage} +# mv tmp ${manpage} +#done %build -%configure +%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 @@ -92,6 +87,26 @@ done # Fix for the libs to get stripped correctly (still required in 3.5.20-2) find %{buildroot}%{_libdir} -name '*.so*' | xargs %{__chmod} +x +# Remove rpath +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvutoxml +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvused +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/cjb2 +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/csepdjvu +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvuserve +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvm +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvuxmlparser +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvutxt +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/ddjvu +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvumake +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} @@ -144,6 +159,9 @@ fi %changelog +* Mon Nov 30 2009 Ralesh Pandit 3.5.22-1 +- Updated to 3.5.22 (#542221) (Spec patch by Michal Schmidt) + * Fri Jul 24 2009 Fedora Release Engineering - 3.5.21-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/import.log b/import.log index 35fe371..0e5a33b 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ djvulibre-3_5_21-1_fc10:HEAD:djvulibre-3.5.21-1.fc10.src.rpm:1232121100 +djvulibre-3_5_22-1_fc13:HEAD:djvulibre-3.5.22-1.fc13.src.rpm:1259828911 diff --git a/sources b/sources index 6d9f4a3..c756841 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c6f3eb03ffbd067b6d2fe2344b0d9ad djvulibre-3.5.21.tar.gz +d1513784ce0e4f37d71595dc34c95ec7 djvulibre-3.5.22.tar.gz