From 2fc26c3478f3ed6d9f892d1f050917d36cbfefd2 Mon Sep 17 00:00:00 2001 From: gafton Date: Wed, 24 Nov 2004 03:10:05 +0000 Subject: [PATCH 01/34] Fix braindead import typo artifact in the default generated Makefile. Oh well, the fedora extras commits list needs a workout anyway... --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2ff382e..5dceb80 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common -test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) From cda0cdf9d224e66512597c248d4ed260f114e6de Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Mon, 14 Feb 2005 11:31:45 +0000 Subject: [PATCH 02/34] - Include %%{_datadir}/mimelnk/image/x-djvu.desktop --- djvulibre.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/djvulibre.spec b/djvulibre.spec index ee5878e..c632b5d 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,10 +1,10 @@ -# $Id: djvulibre.spec,v 1.5 2004/11/16 17:36:36 thias Exp $ +# $Id: djvulibre.spec,v 1.6 2005/02/14 11:31:45 dwmw2 Exp $ # Authority: matthias Summary: DjVu viewers, encoders and utilities Name: djvulibre Version: 3.5.14 -Release: 3 +Release: 4 License: GPL Group: Applications/Publishing URL: http://djvu.sourceforge.net/ @@ -77,6 +77,7 @@ update-desktop-database /usr/share/applications || : %{_datadir}/applications/djview.desktop %{_datadir}/icons/hicolor/??x??/mimetypes/djvu.png %{_datadir}/mime-info/djvu.* +%{_datadir}/mimelnk/image/x-djvu.desktop %{_datadir}/djvu/ %{_datadir}/pixmaps/djvu.png %{_mandir}/man1/* @@ -84,6 +85,9 @@ update-desktop-database /usr/share/applications || : %changelog +* Mon Feb 14 2005 David Woodhouse 3.5.14-4 +- Include %%{_datadir}/mimelnk/image/x-djvu.desktop + * Tue Nov 16 2004 Matthias Saou 3.5.14-3 - Bump release to provide Extras upgrade path. From 0ef59bad270c5216efd2351de0327020e2de0c19 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Sat, 5 Mar 2005 21:10:21 +0000 Subject: [PATCH 03/34] Further mass cleanup. One or more apply : - Remove (hopefully) all zero epoch remains. - Remove trailing spaces and tabs. - Keep consistency between tabs and spaces. - Clean up summary. --- djvulibre.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/djvulibre.spec b/djvulibre.spec index c632b5d..97b92d9 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,6 +1,3 @@ -# $Id: djvulibre.spec,v 1.6 2005/02/14 11:31:45 dwmw2 Exp $ -# Authority: matthias - Summary: DjVu viewers, encoders and utilities Name: djvulibre Version: 3.5.14 @@ -16,7 +13,7 @@ BuildRequires: libstdc++-devel, gcc-c++, mozilla Provides: mozilla-djvulibre = %{version}-%{release} Provides: djvulibre-devel = %{version}-%{release} -%description +%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 resources than competing formats. From e306debbf996022d7401a231065f0b2f2093fa9b Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Wed, 6 Apr 2005 22:11:36 +0000 Subject: [PATCH 04/34] mass release bump for packages not rebuilt after FC-3-split --- djvulibre.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/djvulibre.spec b/djvulibre.spec index 97b92d9..0625d3f 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,7 +1,8 @@ Summary: DjVu viewers, encoders and utilities Name: djvulibre Version: 3.5.14 -Release: 4 +Release: 5 + License: GPL Group: Applications/Publishing URL: http://djvu.sourceforge.net/ @@ -82,6 +83,9 @@ update-desktop-database /usr/share/applications || : %changelog +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Mon Feb 14 2005 David Woodhouse 3.5.14-4 - Include %%{_datadir}/mimelnk/image/x-djvu.desktop From 2aec6e1e02be4b32518b2b303b574b60e3304435 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Thu, 4 Aug 2005 18:10:10 +0000 Subject: [PATCH 05/34] Update to 3.5.15 which fixes some build issues on FC-4, and fix the remaining. --- .cvsignore | 2 +- djvulibre.spec | 59 +++++++++++++++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 41 insertions(+), 22 deletions(-) diff --git a/.cvsignore b/.cvsignore index c3d8dcd..fd287ac 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -djvulibre-3.5.14.tar.gz +djvulibre-3.5.15.tar.gz diff --git a/djvulibre.spec b/djvulibre.spec index 0625d3f..cb971b2 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,15 +1,14 @@ Summary: DjVu viewers, encoders and utilities Name: djvulibre -Version: 3.5.14 -Release: 5 - +Version: 3.5.15 +Release: 1%{?dist} License: GPL Group: Applications/Publishing -URL: http://djvu.sourceforge.net/ +URL: http://djvulibre.djvuzone.org/ Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: XFree86-devel, qt-devel, libjpeg-devel -BuildRequires: libstdc++-devel, gcc-c++, mozilla +BuildRequires: xorg-x11-devel, qt-devel, libjpeg-devel, libtiff-devel +BuildRequires: mozilla, redhat-menus # Provide these here, they're so small, it's not worth splitting them out Provides: mozilla-djvulibre = %{version}-%{release} Provides: djvulibre-devel = %{version}-%{release} @@ -42,13 +41,19 @@ compatible with version 3.5 of the LizardTech DjVu software suite. %install %{__rm} -rf %{buildroot} %makeinstall -%{__mkdir_p} %{buildroot}%{_libdir}/mozilla/plugins -%{__ln_s} ../../netscape/plugins/nsdejavu.so \ - %{buildroot}%{_libdir}/mozilla/plugins/ +# 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 -# Fix for the libs to get stripped correctly (debuginfo) +# Fix for the libs to get stripped correctly (still required in 3.5.15) find %{buildroot}%{_libdir} -name '*.so*' | xargs %{__chmod} +x +# Move menu entry pixmap to new location +%{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ +%{__mv} %{buildroot}%{_datadir}/pixmaps/djvu.png \ + %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/djvu.png + %clean %{__rm} -rf %{buildroot} @@ -56,35 +61,49 @@ find %{buildroot}%{_libdir} -name '*.so*' | xargs %{__chmod} +x %post /sbin/ldconfig +gtk-update-icon-cache -q -f %{_datadir}/icons/hicolor || : update-desktop-database /usr/share/applications || : %postun /sbin/ldconfig +gtk-update-icon-cache -q -f %{_datadir}/icons/hicolor || : update-desktop-database /usr/share/applications || : %files %defattr(-, root, root, 0755) -%doc README COPYRIGHT COPYING NEWS TODO doc +%doc README COPYRIGHT COPYING NEWS TODO doc/ %{_bindir}/* -%{_includedir}/libdjvu/ -%exclude %{_libdir}/*.la -%{_libdir}/*.so* -%{_libdir}/*/plugins/*.so +%{_libdir}/*.so.* +%{_libdir}/mozilla/plugins/nsdejavu.so %{_datadir}/application-registry/djvu.applications %{_datadir}/applications/djview.desktop +%{_datadir}/icons/hicolor/??x??/apps/djvu.png %{_datadir}/icons/hicolor/??x??/mimetypes/djvu.png -%{_datadir}/mime-info/djvu.* -%{_datadir}/mimelnk/image/x-djvu.desktop %{_datadir}/djvu/ -%{_datadir}/pixmaps/djvu.png +%{_datadir}/mime-info/djvu.* %{_mandir}/man1/* %lang(ja) %{_mandir}/ja/man1/* +#files devel +#defattr(-, root, root, 0755) +%{_includedir}/libdjvu/ +%exclude %{_libdir}/*.la +%{_libdir}/*.so + %changelog -* Fri Apr 7 2005 Michael Schwendt -- rebuilt +* Thu Aug 4 2005 Matthias Saou 3.5.15-1 +- Update to 3.5.15. +- Move desktop icon to datadir/icons/hicolor. +- Add gtk-update-icon-cache calls for the new icon. +- Move browser plugin from netscape to mozilla directory instead of symlinking. +- Clean build requirements and add libtiff-devel. +- Add redhat-menus build req since it owns /etc/xdg/menus/applications.menu, + which the configure script checks to install the desktop file. + +* Tue May 3 2005 David Woodhouse 3.5.14-6 +- Remove files that were installed only for older KDE versions. * Mon Feb 14 2005 David Woodhouse 3.5.14-4 - Include %%{_datadir}/mimelnk/image/x-djvu.desktop diff --git a/sources b/sources index 25dceaf..176985b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a9b60d0c47d6b98e321100d329c7f3b3 djvulibre-3.5.14.tar.gz +4a4c5a36799e73bd93afc4fa5d69b315 djvulibre-3.5.15.tar.gz From ffc379865204e8b26603cc1fe126847686450451 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Thu, 4 Aug 2005 18:19:43 +0000 Subject: [PATCH 06/34] Remove _smp_mflags and add OPTS= (#156208). --- djvulibre.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/djvulibre.spec b/djvulibre.spec index cb971b2..55ce7cb 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -35,7 +35,8 @@ compatible with version 3.5 of the LizardTech DjVu software suite. %build %configure -%{__make} %{?_smp_mflags} +# In 3.5.14 %{?_smp_mflags} broke the build +%{__make} OPTS="%{optflags}" %install @@ -101,6 +102,7 @@ update-desktop-database /usr/share/applications || : - Clean build requirements and add libtiff-devel. - Add redhat-menus build req since it owns /etc/xdg/menus/applications.menu, which the configure script checks to install the desktop file. +- Add OPTS to the make line (#156208 - Michael Schwendt). * Tue May 3 2005 David Woodhouse 3.5.14-6 - Remove files that were installed only for older KDE versions. From 4860808ece9561ce2f497b7d1989a3d6f4c45ffe Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Thu, 4 Aug 2005 19:38:52 +0000 Subject: [PATCH 07/34] Fixes for gcc 4.0.1 and mimetypes files install. --- djvulibre-3.5.15-gcc401.patch | 27 +++++++++++++++++++++++++++ djvulibre.spec | 11 +++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 djvulibre-3.5.15-gcc401.patch diff --git a/djvulibre-3.5.15-gcc401.patch b/djvulibre-3.5.15-gcc401.patch new file mode 100644 index 0000000..db003fa --- /dev/null +++ b/djvulibre-3.5.15-gcc401.patch @@ -0,0 +1,27 @@ +=================================================================== +RCS file: /cvsroot/djvu/djvulibre-3.5/libdjvu/GString.h,v +retrieving revision 1.19 +retrieving revision 1.20 +diff -u -r1.19 -r1.20 +--- djvulibre-3.5/libdjvu/GString.h 2004/08/06 15:11:29 1.19 ++++ djvulibre-3.5/libdjvu/GString.h 2005/07/22 15:28:07 1.20 +@@ -138,6 +138,10 @@ + # endif + #endif + ++class GBaseString; ++class GUTF8String; ++class GNativeString; ++ + // Internal string representation. + class GStringRep : public GPEnabled + { +@@ -433,8 +437,6 @@ + virtual unsigned long getValidUCS4(const char *&source) const; + }; + +-class GUTF8String; +-class GNativeString; + + /** General purpose character string. + Each dirivied instance of class #GBaseString# represents a diff --git a/djvulibre.spec b/djvulibre.spec index 55ce7cb..76743ce 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,14 +1,15 @@ Summary: DjVu viewers, encoders and utilities Name: djvulibre Version: 3.5.15 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Publishing URL: http://djvulibre.djvuzone.org/ Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz +Patch0: djvulibre-3.5.15-gcc401.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: xorg-x11-devel, qt-devel, libjpeg-devel, libtiff-devel -BuildRequires: mozilla, redhat-menus +BuildRequires: mozilla, redhat-menus, hicolor-icon-theme # Provide these here, they're so small, it's not worth splitting them out Provides: mozilla-djvulibre = %{version}-%{release} Provides: djvulibre-devel = %{version}-%{release} @@ -31,6 +32,7 @@ compatible with version 3.5 of the LizardTech DjVu software suite. %prep %setup +%patch0 -p1 -b .gcc401 %build @@ -94,6 +96,11 @@ update-desktop-database /usr/share/applications || : %changelog +* Thu Aug 4 2005 Matthias Saou 3.5.15-2 +- Include djvulibre-3.5.15-gcc401.patch to fix compilation with gcc 4.0.1. +- Add hicolor-icon-theme build req for /usr/share/icons/hicolor/48x48/mimetypes + to exist. + * Thu Aug 4 2005 Matthias Saou 3.5.15-1 - Update to 3.5.15. - Move desktop icon to datadir/icons/hicolor. From 64add4392e27313211bc3cf0dbee13406899ee3f Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Mon, 6 Mar 2006 15:51:09 +0000 Subject: [PATCH 08/34] FC5 rebuild. --- .cvsignore | 2 +- djvulibre.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index fd287ac..3bec80f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -djvulibre-3.5.15.tar.gz +djvulibre-3.5.16.tar.gz diff --git a/djvulibre.spec b/djvulibre.spec index 76743ce..2db2bab 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,7 +1,7 @@ Summary: DjVu viewers, encoders and utilities Name: djvulibre Version: 3.5.15 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Publishing URL: http://djvulibre.djvuzone.org/ @@ -96,6 +96,9 @@ update-desktop-database /usr/share/applications || : %changelog +* Mon Mar 6 2005 Matthias Saou 3.5.15-3 +- FC5 rebuild. + * Thu Aug 4 2005 Matthias Saou 3.5.15-2 - Include djvulibre-3.5.15-gcc401.patch to fix compilation with gcc 4.0.1. - Add hicolor-icon-theme build req for /usr/share/icons/hicolor/48x48/mimetypes diff --git a/sources b/sources index 176985b..d9f2e5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4a4c5a36799e73bd93afc4fa5d69b315 djvulibre-3.5.15.tar.gz +5591c99a50aed1613a796a5aa4978fc0 djvulibre-3.5.16.tar.gz From a3139df5b1ff8102ac527158fe0d514e6ffca85c Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Mon, 6 Mar 2006 15:53:08 +0000 Subject: [PATCH 09/34] Fix date typo. --- djvulibre.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/djvulibre.spec b/djvulibre.spec index 2db2bab..c08d3f3 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -96,7 +96,7 @@ update-desktop-database /usr/share/applications || : %changelog -* Mon Mar 6 2005 Matthias Saou 3.5.15-3 +* Mon Mar 6 2006 Matthias Saou 3.5.15-3 - FC5 rebuild. * Thu Aug 4 2005 Matthias Saou 3.5.15-2 From d89b365c138d0c77e016140bd48e14f4910576c0 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Mon, 6 Mar 2006 16:34:50 +0000 Subject: [PATCH 10/34] Work in progress to build for FC5, but there are still some errors to fix. --- djvulibre-3.5.16-extraqualif.patch | 28 ++++++++++++++++++++++++++++ djvulibre.spec | 24 ++++++++++++++++++------ 2 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 djvulibre-3.5.16-extraqualif.patch diff --git a/djvulibre-3.5.16-extraqualif.patch b/djvulibre-3.5.16-extraqualif.patch new file mode 100644 index 0000000..521e7b6 --- /dev/null +++ b/djvulibre-3.5.16-extraqualif.patch @@ -0,0 +1,28 @@ +diff -Naupr djvulibre-3.5.16.orig/libdjvu/ByteStream.h djvulibre-3.5.16/libdjvu/ByteStream.h +--- djvulibre-3.5.16.orig/libdjvu/ByteStream.h 2003-11-07 23:08:20.000000000 +0100 ++++ djvulibre-3.5.16/libdjvu/ByteStream.h 2006-01-30 11:22:17.000000000 +0100 +@@ -242,7 +242,7 @@ public: + and writes it to the specified stream. */ + void formatmessage( const char *fmt, ... ); + /** Looks up the message and writes it to the specified stream. */ +- void ByteStream::writemessage( const char *message ); ++ void writemessage( const char *message ); + /** Writes a one-byte integer to a ByteStream. */ + void write8 (unsigned int card8); + /** Writes a two-bytes integer to a ByteStream. +diff -Naupr djvulibre-3.5.16.orig/libdjvu/GURL.h djvulibre-3.5.16/libdjvu/GURL.h +--- djvulibre-3.5.16.orig/libdjvu/GURL.h 2003-11-07 23:08:21.000000000 +0100 ++++ djvulibre-3.5.16/libdjvu/GURL.h 2006-01-30 11:18:17.000000000 +0100 +@@ -278,10 +278,10 @@ public: + //@} + + /// Returns TRUE if #gurl1# and #gurl2# are the same +- bool GURL::operator==(const GURL & gurl2) const; ++ bool operator==(const GURL & gurl2) const; + + /// Returns TRUE if #gurl1# and #gurl2# are different +- bool GURL::operator!=(const GURL & gurl2) const; ++ bool operator!=(const GURL & gurl2) const; + + /// Assignment operator + GURL & operator=(const GURL & url); diff --git a/djvulibre.spec b/djvulibre.spec index c08d3f3..08b0516 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,15 +1,21 @@ Summary: DjVu viewers, encoders and utilities Name: djvulibre -Version: 3.5.15 -Release: 3%{?dist} +Version: 3.5.16 +Release: 1%{?dist} License: GPL Group: Applications/Publishing URL: http://djvulibre.djvuzone.org/ Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz -Patch0: djvulibre-3.5.15-gcc401.patch +Patch0: djvulibre-3.5.16-extraqualif.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: xorg-x11-devel, qt-devel, libjpeg-devel, libtiff-devel +BuildRequires: qt-devel, libjpeg-devel, libtiff-devel BuildRequires: mozilla, redhat-menus, hicolor-icon-theme +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 +BuildRequires: libXt-devel +%else +BuildRequires: xorg-x11-devel +%endif # Provide these here, they're so small, it's not worth splitting them out Provides: mozilla-djvulibre = %{version}-%{release} Provides: djvulibre-devel = %{version}-%{release} @@ -32,7 +38,7 @@ compatible with version 3.5 of the LizardTech DjVu software suite. %prep %setup -%patch0 -p1 -b .gcc401 +%patch0 -p1 -b .extraqualif %build @@ -96,9 +102,15 @@ update-desktop-database /usr/share/applications || : %changelog -* Mon Mar 6 2006 Matthias Saou 3.5.15-3 +* Mon Mar 6 2006 Matthias Saou 3.5.16-2 - FC5 rebuild. +* Mon Jan 30 2006 Matthias Saou 3.5.16-1 +- Update to 3.5.16. +- Add conditional to build with/without modular X depending on FC version. +- Remove no longer needed gcc4 patch. +- Add extra qualification patch. + * Thu Aug 4 2005 Matthias Saou 3.5.15-2 - Include djvulibre-3.5.15-gcc401.patch to fix compilation with gcc 4.0.1. - Add hicolor-icon-theme build req for /usr/share/icons/hicolor/48x48/mimetypes From 0358dc1f9d89ce3d5ead0b86d363ce4c81e7fc2c Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Wed, 15 Mar 2006 12:20:02 +0000 Subject: [PATCH 11/34] Update to CVS to fix gcc 4.1 build. --- .cvsignore | 2 +- djvulibre-3.5.15-gcc401.patch | 27 --------------------------- djvulibre-3.5.16-extraqualif.patch | 28 ---------------------------- djvulibre.spec | 17 ++++++++++++----- sources | 2 +- 5 files changed, 14 insertions(+), 62 deletions(-) delete mode 100644 djvulibre-3.5.15-gcc401.patch delete mode 100644 djvulibre-3.5.16-extraqualif.patch diff --git a/.cvsignore b/.cvsignore index 3bec80f..c3bd684 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -djvulibre-3.5.16.tar.gz +djvulibre-3.5.16cvs.tar.gz diff --git a/djvulibre-3.5.15-gcc401.patch b/djvulibre-3.5.15-gcc401.patch deleted file mode 100644 index db003fa..0000000 --- a/djvulibre-3.5.15-gcc401.patch +++ /dev/null @@ -1,27 +0,0 @@ -=================================================================== -RCS file: /cvsroot/djvu/djvulibre-3.5/libdjvu/GString.h,v -retrieving revision 1.19 -retrieving revision 1.20 -diff -u -r1.19 -r1.20 ---- djvulibre-3.5/libdjvu/GString.h 2004/08/06 15:11:29 1.19 -+++ djvulibre-3.5/libdjvu/GString.h 2005/07/22 15:28:07 1.20 -@@ -138,6 +138,10 @@ - # endif - #endif - -+class GBaseString; -+class GUTF8String; -+class GNativeString; -+ - // Internal string representation. - class GStringRep : public GPEnabled - { -@@ -433,8 +437,6 @@ - virtual unsigned long getValidUCS4(const char *&source) const; - }; - --class GUTF8String; --class GNativeString; - - /** General purpose character string. - Each dirivied instance of class #GBaseString# represents a diff --git a/djvulibre-3.5.16-extraqualif.patch b/djvulibre-3.5.16-extraqualif.patch deleted file mode 100644 index 521e7b6..0000000 --- a/djvulibre-3.5.16-extraqualif.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Naupr djvulibre-3.5.16.orig/libdjvu/ByteStream.h djvulibre-3.5.16/libdjvu/ByteStream.h ---- djvulibre-3.5.16.orig/libdjvu/ByteStream.h 2003-11-07 23:08:20.000000000 +0100 -+++ djvulibre-3.5.16/libdjvu/ByteStream.h 2006-01-30 11:22:17.000000000 +0100 -@@ -242,7 +242,7 @@ public: - and writes it to the specified stream. */ - void formatmessage( const char *fmt, ... ); - /** Looks up the message and writes it to the specified stream. */ -- void ByteStream::writemessage( const char *message ); -+ void writemessage( const char *message ); - /** Writes a one-byte integer to a ByteStream. */ - void write8 (unsigned int card8); - /** Writes a two-bytes integer to a ByteStream. -diff -Naupr djvulibre-3.5.16.orig/libdjvu/GURL.h djvulibre-3.5.16/libdjvu/GURL.h ---- djvulibre-3.5.16.orig/libdjvu/GURL.h 2003-11-07 23:08:21.000000000 +0100 -+++ djvulibre-3.5.16/libdjvu/GURL.h 2006-01-30 11:18:17.000000000 +0100 -@@ -278,10 +278,10 @@ public: - //@} - - /// Returns TRUE if #gurl1# and #gurl2# are the same -- bool GURL::operator==(const GURL & gurl2) const; -+ bool operator==(const GURL & gurl2) const; - - /// Returns TRUE if #gurl1# and #gurl2# are different -- bool GURL::operator!=(const GURL & gurl2) const; -+ bool operator!=(const GURL & gurl2) const; - - /// Assignment operator - GURL & operator=(const GURL & url); diff --git a/djvulibre.spec b/djvulibre.spec index 08b0516..ef259b1 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,12 +1,11 @@ Summary: DjVu viewers, encoders and utilities Name: djvulibre Version: 3.5.16 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Publishing URL: http://djvulibre.djvuzone.org/ -Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz -Patch0: djvulibre-3.5.16-extraqualif.patch +Source: http://dl.sf.net/djvu/djvulibre-%{version}cvs.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: qt-devel, libjpeg-devel, libtiff-devel BuildRequires: mozilla, redhat-menus, hicolor-icon-theme @@ -38,7 +37,9 @@ compatible with version 3.5 of the LizardTech DjVu software suite. %prep %setup -%patch0 -p1 -b .extraqualif +# In 3.5.15cvs, hardcoded "/usr/include/qt3" needs replacing +. /etc/profile.d/qt.sh +%{__perl} -pi -e "s|/usr/include/qt3|${QTINC}|g" gui/djview/Makefile.dep %build @@ -97,13 +98,19 @@ update-desktop-database /usr/share/applications || : #files devel #defattr(-, root, root, 0755) %{_includedir}/libdjvu/ +%{_libdir}/pkgconfig/ddjvuapi.pc %exclude %{_libdir}/*.la %{_libdir}/*.so %changelog +* Tue Mar 14 2006 Matthias Saou 3.5.16-3 +- Update to CVS snapshot, fixes the build with gcc 4.1 (sf.net #1420522). +- Include workaround for wrong qt3 includes in gui/djview/Makefile.dep. +- Add new pkgconfig ddjvuapi.pc file. + * Mon Mar 6 2006 Matthias Saou 3.5.16-2 -- FC5 rebuild. +- FC5 rebuild... nope. * Mon Jan 30 2006 Matthias Saou 3.5.16-1 - Update to 3.5.16. diff --git a/sources b/sources index d9f2e5d..64e7658 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5591c99a50aed1613a796a5aa4978fc0 djvulibre-3.5.16.tar.gz +45e3436ca4a0f2d791909464da03bf62 djvulibre-3.5.16cvs.tar.gz From 4c9d33b4f2fefbdab16e6f92a41a8b08a58fee6b Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Sun, 2 Jul 2006 18:26:24 +0000 Subject: [PATCH 12/34] Update to 3.5.17. --- .cvsignore | 2 +- djvulibre.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index c3bd684..7ca0778 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -djvulibre-3.5.16cvs.tar.gz +djvulibre-3.5.17.tar.gz diff --git a/djvulibre.spec b/djvulibre.spec index ef259b1..8c29f62 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,11 +1,11 @@ Summary: DjVu viewers, encoders and utilities Name: djvulibre -Version: 3.5.16 -Release: 3%{?dist} +Version: 3.5.17 +Release: 1%{?dist} License: GPL Group: Applications/Publishing URL: http://djvulibre.djvuzone.org/ -Source: http://dl.sf.net/djvu/djvulibre-%{version}cvs.tar.gz +Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: qt-devel, libjpeg-devel, libtiff-devel BuildRequires: mozilla, redhat-menus, hicolor-icon-theme @@ -104,8 +104,11 @@ update-desktop-database /usr/share/applications || : %changelog +* Sun Jul 2 2006 Matthias Saou 3.5.17-1 +- Update to 3.5.17. + * Tue Mar 14 2006 Matthias Saou 3.5.16-3 -- Update to CVS snapshot, fixes the build with gcc 4.1 (sf.net #1420522). +- Update to CVS snapshot, fixes the build with gcc 4.1 (sf.net #1420522).. NOT! - Include workaround for wrong qt3 includes in gui/djview/Makefile.dep. - Add new pkgconfig ddjvuapi.pc file. diff --git a/sources b/sources index 64e7658..78b3322 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -45e3436ca4a0f2d791909464da03bf62 djvulibre-3.5.16cvs.tar.gz +18e71eec1f7d59ef4710b405ea64650e djvulibre-3.5.17.tar.gz From 18402c0f0b7e94b532d670827e62d9720d025822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 20:21:31 +0000 Subject: [PATCH 13/34] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 206952db7f37e28b9e1a3f723a6bdfd5d894ba85 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Mon, 28 Aug 2006 09:21:10 +0000 Subject: [PATCH 14/34] FC6 rebuilds. --- djvulibre.spec | 7 +++++-- needs.rebuild | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 needs.rebuild diff --git a/djvulibre.spec b/djvulibre.spec index 8c29f62..aac83fc 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,7 +1,7 @@ Summary: DjVu viewers, encoders and utilities Name: djvulibre Version: 3.5.17 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Publishing URL: http://djvulibre.djvuzone.org/ @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: qt-devel, libjpeg-devel, libtiff-devel BuildRequires: mozilla, redhat-menus, hicolor-icon-theme # Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora -%if %{!?fedora:5}%{?fedora} >= 5 +%if %{!?fedora:6}%{?fedora} >= 5 BuildRequires: libXt-devel %else BuildRequires: xorg-x11-devel @@ -104,6 +104,9 @@ update-desktop-database /usr/share/applications || : %changelog +* Mon Aug 28 2006 Matthias Saou 3.5.17-2 +- FC6 rebuild. + * Sun Jul 2 2006 Matthias Saou 3.5.17-1 - Update to 3.5.17. diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 0c0f75b34a76a437692fa73210187c769ee122e2 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Tue, 29 Aug 2006 17:26:12 +0000 Subject: [PATCH 15/34] Use seamonkey for FC6+ and add build requirement to get all checked dirs. --- djvulibre.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/djvulibre.spec b/djvulibre.spec index aac83fc..38c74a3 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -8,13 +8,22 @@ URL: http://djvulibre.djvuzone.org/ Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: qt-devel, libjpeg-devel, libtiff-devel -BuildRequires: mozilla, redhat-menus, hicolor-icon-theme +# These packages provide directories checked at configure time : +BuildRequires: redhat-menus, hicolor-icon-theme +# /usr/share/application-registry & /usr/share/mime-info : +BuildRequires: gnome-mime-data # Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora %if %{!?fedora:6}%{?fedora} >= 5 BuildRequires: libXt-devel %else BuildRequires: xorg-x11-devel %endif +# Use mozilla up to FC5, and seamonkey for FC6+ and non-Fedora +%if %{!?fedora:6}%{?fedora} >= 6 +BuildRequires: seamonkey +%else +BuildRequires: mozilla +%endif # Provide these here, they're so small, it's not worth splitting them out Provides: mozilla-djvulibre = %{version}-%{release} Provides: djvulibre-devel = %{version}-%{release} @@ -106,6 +115,8 @@ update-desktop-database /usr/share/applications || : %changelog * Mon Aug 28 2006 Matthias Saou 3.5.17-2 - FC6 rebuild. +- Use mozilla up to FC5, and seamonkey for FC6+ and non-Fedora. +- Build require gnome-mime-data to get build time detected dirs in place. * Sun Jul 2 2006 Matthias Saou 3.5.17-1 - Update to 3.5.17. From 3552945c8448a882b9d99a6ba48593d158598505 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Mon, 5 Feb 2007 12:43:51 +0000 Subject: [PATCH 16/34] Update to 3.5.18 (with major spec file changes). --- .cvsignore | 2 +- djvulibre.spec | 112 ++++++++++++++++++++++++------------------------- sources | 2 +- 3 files changed, 57 insertions(+), 59 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7ca0778..a7f17d0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -djvulibre-3.5.17.tar.gz +djvulibre-3.5.18.tar.gz diff --git a/djvulibre.spec b/djvulibre.spec index 38c74a3..302ce7a 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,78 +1,63 @@ -Summary: DjVu viewers, encoders and utilities +Summary: DjVu viewers, encoders, utilities and web browser plugin Name: djvulibre -Version: 3.5.17 -Release: 2%{?dist} +Version: 3.5.18 +Release: 1%{?dist} License: GPL Group: Applications/Publishing -URL: http://djvulibre.djvuzone.org/ +URL: http://djvu.sourceforge.net/ Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires(post): xdg-utils, /sbin/ldconfig +Requires(preun): xdg-utils BuildRequires: qt-devel, libjpeg-devel, libtiff-devel -# These packages provide directories checked at configure time : -BuildRequires: redhat-menus, hicolor-icon-theme -# /usr/share/application-registry & /usr/share/mime-info : -BuildRequires: gnome-mime-data -# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora -%if %{!?fedora:6}%{?fedora} >= 5 -BuildRequires: libXt-devel -%else -BuildRequires: xorg-x11-devel -%endif -# Use mozilla up to FC5, and seamonkey for FC6+ and non-Fedora -%if %{!?fedora:6}%{?fedora} >= 6 -BuildRequires: seamonkey -%else -BuildRequires: mozilla -%endif -# Provide these here, they're so small, it's not worth splitting them out +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} -Provides: djvulibre-devel = %{version}-%{release} %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 resources than competing formats. -DjVu was originally developed 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) +and images. DjVu can advantageously replace PDF, PS, TIFF, JPEG, and GIF for +distributing scanned documents, digital documents, or high-resolution pictures. +DjVu content downloads faster, displays and renders faster, looks nicer on a +screen, and consume less client resources than competing formats. DjVu images +display instantly and can be smoothly zoomed and panned with no lengthy +re-rendering. -In an effort to promote DjVu as a Web standard, the LizardTech management was -enlightened enough to release the reference implementation of DjVu under the -GNU GPL in October 2000. DjVuLibre (which means free DjVu), is an enhanced -version of that code maintained by the original inventors of DjVu. It is -compatible with version 3.5 of the LizardTech DjVu software suite. +DjVuLibre is a free (GPL'ed) implementation of DjVu, including viewers, browser +plugins, decoders, simple encoders, and utilities. + + +%package devel +Summary: Development files for djvulibre +Group: Development/Libraries +Requires: %{name} = %{version}-%{release}, pkgconfig + +%description devel +Development files for djvulibre. %prep %setup -# In 3.5.15cvs, hardcoded "/usr/include/qt3" needs replacing -. /etc/profile.d/qt.sh -%{__perl} -pi -e "s|/usr/include/qt3|${QTINC}|g" gui/djview/Makefile.dep %build %configure -# In 3.5.14 %{?_smp_mflags} broke the build +# In 3.5.14 %{?_smp_mflags} broke the build - still in 3.5.18 %{__make} OPTS="%{optflags}" %install %{__rm} -rf %{buildroot} -%makeinstall +%{__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 -# Fix for the libs to get stripped correctly (still required in 3.5.15) +# Fix for the libs to get stripped correctly (still required in 3.5.18) find %{buildroot}%{_libdir} -name '*.so*' | xargs %{__chmod} +x -# Move menu entry pixmap to new location -%{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ -%{__mv} %{buildroot}%{_datadir}/pixmaps/djvu.png \ - %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/djvu.png - %clean %{__rm} -rf %{buildroot} @@ -80,13 +65,21 @@ find %{buildroot}%{_libdir} -name '*.so*' | xargs %{__chmod} +x %post /sbin/ldconfig -gtk-update-icon-cache -q -f %{_datadir}/icons/hicolor || : -update-desktop-database /usr/share/applications || : +# Menu entry (icons and desktop file) +%{_datadir}/djvu/djview3/desktop/register-djview-menu install || : +# MIME types (icons and desktop file) +%{_datadir}/djvu/osi/desktop/register-djvu-mime install || : -%postun -/sbin/ldconfig -gtk-update-icon-cache -q -f %{_datadir}/icons/hicolor || : -update-desktop-database /usr/share/applications || : +%preun +# Removal, not update +if [ $1 -eq 0 ]; then + # Menu entry (icons and desktop file) + %{_datadir}/djvu/djview3/desktop/register-djview-menu uninstall || : + # MIME types (icons and desktop file) + %{_datadir}/djvu/osi/desktop/register-djvu-mime uninstall || : +fi + +%postun -p /sbin/ldconfig %files @@ -95,17 +88,14 @@ update-desktop-database /usr/share/applications || : %{_bindir}/* %{_libdir}/*.so.* %{_libdir}/mozilla/plugins/nsdejavu.so -%{_datadir}/application-registry/djvu.applications -%{_datadir}/applications/djview.desktop -%{_datadir}/icons/hicolor/??x??/apps/djvu.png -%{_datadir}/icons/hicolor/??x??/mimetypes/djvu.png %{_datadir}/djvu/ -%{_datadir}/mime-info/djvu.* %{_mandir}/man1/* +#lang(de) %{_mandir}/de/man1/* +#lang(fr) %{_mandir}/fr/man1/* %lang(ja) %{_mandir}/ja/man1/* -#files devel -#defattr(-, root, root, 0755) +%files devel +%defattr(-, root, root, 0755) %{_includedir}/libdjvu/ %{_libdir}/pkgconfig/ddjvuapi.pc %exclude %{_libdir}/*.la @@ -113,6 +103,14 @@ update-desktop-database /usr/share/applications || : %changelog +* Mon Feb 5 2007 Matthias Saou 3.5.18-1 +- Update to 3.5.18. +- Remove no longer needed /usr/include/qt3 replacing. +- Replace desktop build requirements and scriplets with new xdg utils way. +- Include new de and fr man page translations... not! Directories are empty. +- Split -devel sub-package, as the new djview4 should build require it. +- No longer build require a web browser, the plugin always gets built now. + * Mon Aug 28 2006 Matthias Saou 3.5.17-2 - FC6 rebuild. - Use mozilla up to FC5, and seamonkey for FC6+ and non-Fedora. diff --git a/sources b/sources index 78b3322..0f6af74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -18e71eec1f7d59ef4710b405ea64650e djvulibre-3.5.17.tar.gz +73fd6d4f92832b85a91529b7bb3b7710 djvulibre-3.5.18.tar.gz From 89ffb12614d33e99671993eddcbaf3a7820d6afe Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Fri, 8 Jun 2007 13:18:32 +0000 Subject: [PATCH 17/34] Update to 3.5.19 and try to fix multilib man page issue (#228359). --- .cvsignore | 2 +- djvulibre-3.5.18-plugin-manpage.patch | 162 ++++++++++++++++++++++++++ djvulibre.spec | 32 +++-- sources | 2 +- 4 files changed, 189 insertions(+), 9 deletions(-) create mode 100644 djvulibre-3.5.18-plugin-manpage.patch diff --git a/.cvsignore b/.cvsignore index a7f17d0..bc7067f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -djvulibre-3.5.18.tar.gz +djvulibre-3.5.19.tar.gz diff --git a/djvulibre-3.5.18-plugin-manpage.patch b/djvulibre-3.5.18-plugin-manpage.patch new file mode 100644 index 0000000..45294c6 --- /dev/null +++ b/djvulibre-3.5.18-plugin-manpage.patch @@ -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 説明 + 共有ライブラリ diff --git a/djvulibre.spec b/djvulibre.spec index 302ce7a..160905b 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -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 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 3.5.18-2 +- Include man page patch to have man pages be identical across archs (#228359). + * Mon Feb 5 2007 Matthias Saou 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 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. diff --git a/sources b/sources index 0f6af74..b130210 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -73fd6d4f92832b85a91529b7bb3b7710 djvulibre-3.5.18.tar.gz +0330d87ad337e408e21e1018eb511839 djvulibre-3.5.19.tar.gz From ee00d6007c73e7eb2643e023ed09c585f43ce80c Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Mon, 11 Jun 2007 12:11:32 +0000 Subject: [PATCH 18/34] Include patch to remove LC_CTYPE for ja man pages, fixes sed 100% CPU issue. --- djvulibre-3.5.19-ja-encoding.patch | 11 +++++++++++ djvulibre.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 djvulibre-3.5.19-ja-encoding.patch diff --git a/djvulibre-3.5.19-ja-encoding.patch b/djvulibre-3.5.19-ja-encoding.patch new file mode 100644 index 0000000..d7f3ae9 --- /dev/null +++ b/djvulibre-3.5.19-ja-encoding.patch @@ -0,0 +1,11 @@ +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.spec b/djvulibre.spec index 160905b..dd8ae1c 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,12 +1,13 @@ Summary: DjVu viewers, encoders, utilities and web browser plugin Name: djvulibre Version: 3.5.19 -Release: 1%{?dist} +Release: 2%{?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 +Patch1: djvulibre-3.5.19-ja-encoding.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires(post): xdg-utils, /sbin/ldconfig Requires(preun): xdg-utils @@ -39,6 +40,7 @@ Development files for djvulibre. %prep %setup -q %patch0 -p1 -b .plugin-manpage +%patch1 -p1 -b .ja-encoding # 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) @@ -113,6 +115,9 @@ fi %changelog +* Mon Jun 11 2007 Matthias Saou 3.5.19-2 +- Include patch to remove LC_CTYPE for ja man pages, fixes sed 100% CPU issue. + * Fri Jun 8 2007 Matthias Saou 3.5.19-1 - Update to 3.5.19. - Disable rpath on 64bit... not. From 0407dd1f37882b25ac84549a67d3caeea10c728d Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Mon, 6 Aug 2007 14:32:24 +0000 Subject: [PATCH 19/34] Update License field. --- djvulibre.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/djvulibre.spec b/djvulibre.spec index dd8ae1c..168c2ac 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,8 +1,8 @@ Summary: DjVu viewers, encoders, utilities and web browser plugin Name: djvulibre Version: 3.5.19 -Release: 2%{?dist} -License: GPL +Release: 3%{?dist} +License: GPLv2+ Group: Applications/Publishing URL: http://djvu.sourceforge.net/ Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz @@ -115,6 +115,9 @@ fi %changelog +* Mon Aug 6 2007 Matthias Saou 3.5.19-3 +- Update License field. + * Mon Jun 11 2007 Matthias Saou 3.5.19-2 - Include patch to remove LC_CTYPE for ja man pages, fixes sed 100% CPU issue. From d19d32c8199a765f26f3f9da119848756ffd492c Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Wed, 22 Aug 2007 13:58:06 +0000 Subject: [PATCH 20/34] Rebuild for new BuildID feature. --- djvulibre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/djvulibre.spec b/djvulibre.spec index 168c2ac..d97812d 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,7 +1,7 @@ Summary: DjVu viewers, encoders, utilities and web browser plugin Name: djvulibre Version: 3.5.19 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Applications/Publishing URL: http://djvu.sourceforge.net/ @@ -115,6 +115,9 @@ fi %changelog +* Wed Aug 22 2007 Matthias Saou 3.5.19-4 +- Rebuild for new BuildID feature. + * Mon Aug 6 2007 Matthias Saou 3.5.19-3 - Update License field. From ef99b57fd4b478242cff0faf5462f1d6aa7bb9a3 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Sun, 3 Feb 2008 16:02:15 +0000 Subject: [PATCH 21/34] Update to 3.5.20-2 and split off libs and mozplugin sub-packages. --- .cvsignore | 2 +- djvulibre.spec | 73 +++++++++++++++++++++++++++++++++++--------------- sources | 2 +- 3 files changed, 54 insertions(+), 23 deletions(-) diff --git a/.cvsignore b/.cvsignore index bc7067f..cb8fb54 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -djvulibre-3.5.19.tar.gz +djvulibre-3.5.20-2.tar.gz diff --git a/djvulibre.spec b/djvulibre.spec index d97812d..6570d76 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,19 +1,20 @@ Summary: DjVu viewers, encoders, utilities and web browser plugin Name: djvulibre -Version: 3.5.19 -Release: 4%{?dist} +Version: 3.5.20 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Publishing URL: http://djvu.sourceforge.net/ -Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz +Source: http://dl.sf.net/djvu/djvulibre-%{version}-2.tar.gz Patch0: djvulibre-3.5.18-plugin-manpage.patch Patch1: djvulibre-3.5.19-ja-encoding.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: libjpeg-devel +BuildRequires: libtiff-devel +BuildRequires: qt-devel BuildRequires: xdg-utils -Provides: mozilla-djvulibre = %{version}-%{release} %description DjVu is a web-centric format and software platform for distributing documents @@ -28,22 +29,40 @@ DjVuLibre is a free (GPL'ed) implementation of DjVu, including viewers, browser plugins, decoders, simple encoders, and utilities. +%package libs +Summary: Library files for DjVuLibre +Group: System Environment/Libraries + +%description libs +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 +Summary: Development files for DjVuLibre Group: Development/Libraries -Requires: %{name} = %{version}-%{release}, pkgconfig +Requires: %{name}-libs = %{version}-%{release} +Requires: pkgconfig %description devel -Development files for djvulibre. +Development files for DjVuLibre. %prep %setup -q %patch0 -p1 -b .plugin-manpage %patch1 -p1 -b .ja-encoding -# 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) +# 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} @@ -52,10 +71,10 @@ done %build %configure -# Disable rpath on 64bit - NOT! It makes the build fail (3.5.19) +# 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.18 +# In 3.5.14 %{?_smp_mflags} broke the build - still in 3.5.20-2 %{__make} OPTS="%{optflags}" @@ -67,7 +86,7 @@ done %{__mv} %{buildroot}%{_libdir}/netscape/plugins/nsdejavu.so \ %{buildroot}%{_libdir}/mozilla/plugins/nsdejavu.so -# Fix for the libs to get stripped correctly (still required in 3.5.18) +# Fix for the libs to get stripped correctly (still required in 3.5.20-2) find %{buildroot}%{_libdir} -name '*.so*' | xargs %{__chmod} +x @@ -76,7 +95,6 @@ find %{buildroot}%{_libdir} -name '*.so*' | xargs %{__chmod} +x %post -/sbin/ldconfig # Menu entry (icons and desktop file) %{_datadir}/djvu/djview3/desktop/register-djview-menu install || : # MIME types (icons and desktop file) @@ -91,23 +109,31 @@ if [ $1 -eq 0 ]; then %{_datadir}/djvu/osi/desktop/register-djvu-mime uninstall || : fi -%postun -p /sbin/ldconfig + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) -%doc README COPYRIGHT COPYING NEWS TODO doc/ %{_bindir}/* -%{_libdir}/*.so.* -%{_libdir}/mozilla/plugins/nsdejavu.so %{_datadir}/djvu/ %{_mandir}/man1/* -#lang(de) %{_mandir}/de/man1/* -#lang(fr) %{_mandir}/fr/man1/* %lang(ja) %{_mandir}/ja/man1/* +%files libs +%defattr(-,root,root,-) +%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/*.* %{_includedir}/libdjvu/ %{_libdir}/pkgconfig/ddjvuapi.pc %exclude %{_libdir}/*.la @@ -115,6 +141,11 @@ fi %changelog +* Sun Feb 3 2008 Matthias Saou 3.5.20-1 +- Update to 3.5.20-2 (#431025). +- Split off a -libs sub-package (#391201). +- Split off a -mozplugin sub-package. + * Wed Aug 22 2007 Matthias Saou 3.5.19-4 - Rebuild for new BuildID feature. diff --git a/sources b/sources index b130210..b8ef7e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0330d87ad337e408e21e1018eb511839 djvulibre-3.5.19.tar.gz +9211170b1ada6c75971d01353a73333e djvulibre-3.5.20-2.tar.gz From 6d5ee97139eb925c533809de4a809df06d10be55 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Sun, 3 Feb 2008 16:15:25 +0000 Subject: [PATCH 22/34] Update summary and description. --- djvulibre.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/djvulibre.spec b/djvulibre.spec index 6570d76..196073f 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,4 +1,4 @@ -Summary: DjVu viewers, encoders, utilities and web browser plugin +Summary: DjVu viewers, encoders, and utilities Name: djvulibre Version: 3.5.20 Release: 1%{?dist} @@ -25,8 +25,9 @@ screen, and consume less client resources than competing formats. DjVu images display instantly and can be smoothly zoomed and panned with no lengthy re-rendering. -DjVuLibre is a free (GPL'ed) implementation of DjVu, including viewers, browser -plugins, decoders, simple encoders, and utilities. +DjVuLibre is a free (GPL'ed) implementation of DjVu, including viewers, +decoders, simple encoders, and utilities. The browser plugin is in its own +separate sub-package. %package libs From 6f37317b609b197017a62b905847e1effaf011a5 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Sun, 3 Feb 2008 16:20:52 +0000 Subject: [PATCH 23/34] Bump release to be able to resubmit to koji (weird problem). --- djvulibre.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/djvulibre.spec b/djvulibre.spec index 196073f..e0a988d 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,7 +1,7 @@ Summary: DjVu viewers, encoders, and utilities Name: djvulibre Version: 3.5.20 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Publishing URL: http://djvu.sourceforge.net/ @@ -142,7 +142,7 @@ fi %changelog -* Sun Feb 3 2008 Matthias Saou 3.5.20-1 +* Sun Feb 3 2008 Matthias Saou 3.5.20-2 - Update to 3.5.20-2 (#431025). - Split off a -libs sub-package (#391201). - Split off a -mozplugin sub-package. From a3a7f947ba88eb98a4a75fe4ff14db15531db53f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2008 22:35:51 +0000 Subject: [PATCH 24/34] BR qt3-devel --- djvulibre.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/djvulibre.spec b/djvulibre.spec index e0a988d..25238d2 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,7 +1,7 @@ Summary: DjVu viewers, encoders, and utilities Name: djvulibre Version: 3.5.20 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Publishing URL: http://djvu.sourceforge.net/ @@ -13,7 +13,7 @@ Requires(post): xdg-utils, /sbin/ldconfig Requires(preun): xdg-utils BuildRequires: libjpeg-devel BuildRequires: libtiff-devel -BuildRequires: qt-devel +BuildRequires: qt3-devel BuildRequires: xdg-utils %description @@ -142,6 +142,9 @@ fi %changelog +* Fri Jun 06 2008 Dennis Gilmore 3.5.20-3 +- BR qt3-devel + * Sun Feb 3 2008 Matthias Saou 3.5.20-2 - Update to 3.5.20-2 (#431025). - Split off a -libs sub-package (#391201). From 60c5f6ae3742739d6b498bc2fc9db9837c3d3cd3 Mon Sep 17 00:00:00 2001 From: Rakesh Pandit Date: Sat, 17 Jan 2009 03:52:28 +0000 Subject: [PATCH 25/34] Updated to 3.5.21. --- .cvsignore | 2 +- djvulibre-configure.patch | 10 ++++++++++ djvulibre.spec | 11 ++++++++--- import.log | 1 + sources | 2 +- 5 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 djvulibre-configure.patch create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index cb8fb54..f07c377 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -djvulibre-3.5.20-2.tar.gz +djvulibre-3.5.21.tar.gz diff --git a/djvulibre-configure.patch b/djvulibre-configure.patch new file mode 100644 index 0000000..915f1a3 --- /dev/null +++ b/djvulibre-configure.patch @@ -0,0 +1,10 @@ +--- 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 25238d2..b5c332f 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,13 +1,14 @@ Summary: DjVu viewers, encoders, and utilities Name: djvulibre -Version: 3.5.20 -Release: 3%{?dist} +Version: 3.5.21 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Publishing URL: http://djvu.sourceforge.net/ -Source: http://dl.sf.net/djvu/djvulibre-%{version}-2.tar.gz +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 @@ -63,6 +64,7 @@ Development files for DjVuLibre. %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} @@ -142,6 +144,9 @@ fi %changelog +* Sat Jan 17 2009 Rakesh Pandit 3.5.21-1 +- Updated to 3.5.21 + * Fri Jun 06 2008 Dennis Gilmore 3.5.20-3 - BR qt3-devel diff --git a/import.log b/import.log new file mode 100644 index 0000000..35fe371 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +djvulibre-3_5_21-1_fc10:HEAD:djvulibre-3.5.21-1.fc10.src.rpm:1232121100 diff --git a/sources b/sources index b8ef7e9..6d9f4a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9211170b1ada6c75971d01353a73333e djvulibre-3.5.20-2.tar.gz +4c6f3eb03ffbd067b6d2fe2344b0d9ad djvulibre-3.5.21.tar.gz From dd0820a47ed94da4382523a78c83976a2b45d75b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 12:05:35 +0000 Subject: [PATCH 26/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- djvulibre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/djvulibre.spec b/djvulibre.spec index b5c332f..9b7015a 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,7 +1,7 @@ Summary: DjVu viewers, encoders, and utilities Name: djvulibre Version: 3.5.21 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Publishing URL: http://djvu.sourceforge.net/ @@ -144,6 +144,9 @@ fi %changelog +* Tue Feb 24 2009 Fedora Release Engineering - 3.5.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Jan 17 2009 Rakesh Pandit 3.5.21-1 - Updated to 3.5.21 From 57e71a1a8a370202efaaa8c2ca4afa45efb79b22 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 20:22:10 +0000 Subject: [PATCH 27/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- djvulibre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/djvulibre.spec b/djvulibre.spec index 9b7015a..c5f7238 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,7 +1,7 @@ Summary: DjVu viewers, encoders, and utilities Name: djvulibre Version: 3.5.21 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Publishing URL: http://djvu.sourceforge.net/ @@ -144,6 +144,9 @@ fi %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 3.5.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Feb 24 2009 Fedora Release Engineering - 3.5.21-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From f824297c80837a6fbdc9e14f754326cdcf3622df Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:12:02 +0000 Subject: [PATCH 28/34] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5dceb80..f0859c5 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := djvulibre SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 751593acb095b24db999b3304ebf9a07581b36fa Mon Sep 17 00:00:00 2001 From: Rakesh Pandit Date: Thu, 3 Dec 2009 08:15:58 +0000 Subject: [PATCH 29/34] 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 From 3a6c142b643df44926c46e446932e6b6ae133545 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:05:52 +0000 Subject: [PATCH 30/34] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 2 -- 3 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index f0859c5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: djvulibre -# $Id$ -NAME := djvulibre -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 0e5a33b..0000000 --- a/import.log +++ /dev/null @@ -1,2 +0,0 @@ -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 From 481e292e47cd6165eaff656f81e82b63c3896114 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mon, 31 Jan 2011 14:26:28 +0100 Subject: [PATCH 31/34] add include cstddefs for size_t --- djvulibre-3.5.22-cdefs.patch | 12 ++++++++++++ djvulibre.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 djvulibre-3.5.22-cdefs.patch diff --git a/djvulibre-3.5.22-cdefs.patch b/djvulibre-3.5.22-cdefs.patch new file mode 100644 index 0000000..d62ef08 --- /dev/null +++ b/djvulibre-3.5.22-cdefs.patch @@ -0,0 +1,12 @@ +diff -up djvulibre-3.5.22/libdjvu/GSmartPointer.h.cdefs djvulibre-3.5.22/libdjvu/GSmartPointer.h +--- djvulibre-3.5.22/libdjvu/GSmartPointer.h.cdefs 2008-03-05 01:44:20.000000000 +0000 ++++ djvulibre-3.5.22/libdjvu/GSmartPointer.h 2011-01-31 13:43:37.595917364 +0000 +@@ -65,6 +65,8 @@ + # pragma interface + #endif + ++#include ++ + /** @name GSmartPointer.h + + Files #"GSmartPointer.h"# and #"GSmartPointer.cpp"# define a smart-pointer diff --git a/djvulibre.spec b/djvulibre.spec index 46da09d..255ff81 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,11 +1,12 @@ Summary: DjVu viewers, encoders, and utilities Name: djvulibre Version: 3.5.22 -Release: 1%{?dist} +Release: 2%{?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(preun): xdg-utils @@ -59,6 +60,7 @@ Development files for DjVuLibre. %prep %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 @@ -159,6 +161,9 @@ fi %changelog +* Mon Jan 31 2011 Karsten Hopp 3.5.22-2 +- add include cstddefs for size_t + * Mon Nov 30 2009 Ralesh Pandit 3.5.22-1 - Updated to 3.5.22 (#542221) (Spec patch by Michal Schmidt) From 05551df3ce18552a7e3e70c66f07bb1f9192fb1a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 8 Aug 2011 13:26:56 +0100 Subject: [PATCH 32/34] 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 3.5.24-1 +- 3.5.24 +- Obsolete mozplugin, dropped upstream +- Dropped djview3, use djview4 + * Mon Jan 31 2011 Karsten Hopp 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 From c91bd6fb4e3094ab1c07b66032fbaf68cc4d6604 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 18:49:14 -0600 Subject: [PATCH 33/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- djvulibre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/djvulibre.spec b/djvulibre.spec index b29f63b..b9486d4 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,7 +1,7 @@ Summary: DjVu viewers, encoders, and utilities Name: djvulibre Version: 3.5.24 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Publishing URL: http://djvu.sourceforge.net/ @@ -133,6 +133,9 @@ fi %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 3.5.24-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Aug 8 2011 Peter Robinson 3.5.24-1 - 3.5.24 - Obsolete mozplugin, dropped upstream From aeeb7d6647c07a0621464c16e1dbfc9f2506ab23 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 17 Feb 2012 15:12:51 -0700 Subject: [PATCH 34/34] Don't call register-djview-menu since we don't build djview3 anymore --- djvulibre.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/djvulibre.spec b/djvulibre.spec index b9486d4..c45578d 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,7 +1,7 @@ Summary: DjVu viewers, encoders, and utilities Name: djvulibre Version: 3.5.24 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Publishing URL: http://djvu.sourceforge.net/ @@ -91,16 +91,12 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/bzz %post -# Menu entry (icons and desktop file) -%{_datadir}/djvu/djview3/desktop/register-djview-menu install || : # MIME types (icons and desktop file) %{_datadir}/djvu/osi/desktop/register-djvu-mime install || : %preun # Removal, not update if [ $1 -eq 0 ]; then - # Menu entry (icons and desktop file) - %{_datadir}/djvu/djview3/desktop/register-djview-menu uninstall || : # MIME types (icons and desktop file) %{_datadir}/djvu/osi/desktop/register-djvu-mime uninstall || : fi @@ -133,6 +129,9 @@ fi %changelog +* Fri Feb 17 2012 Orion Poplawski - 3.5.24-3 +- Don't call register-djview-menu since we don't build djview3 anymore (bug 734856) + * Fri Jan 13 2012 Fedora Release Engineering - 3.5.24-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild