From dfab36a9a1e3aed25692dada6272c1b16a0b52cd Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Fri, 11 Oct 2002 19:33:50 +0000
Subject: [PATCH] - updated to 3.5.9, removed obsolete gcc3 patch - added
 nostrip patch - workaround for SEGV when build by gcc 3.2 with "-O2
 -march=athlon"   (miscompilation? hard to find where :/)

Changed files:
    djvulibre-gcc3.patch -> 1.2
    djvulibre-nostrip.patch -> 1.1
    djvulibre.spec -> 1.10
---
 djvulibre-gcc3.patch    | 11 -----------
 djvulibre-nostrip.patch | 22 ++++++++++++++++++++++
 djvulibre.spec          | 12 +++++++++---
 3 files changed, 31 insertions(+), 14 deletions(-)
 delete mode 100644 djvulibre-gcc3.patch
 create mode 100644 djvulibre-nostrip.patch

diff --git a/djvulibre-gcc3.patch b/djvulibre-gcc3.patch
deleted file mode 100644
index 036a3f0..0000000
--- a/djvulibre-gcc3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- djvulibre-3.5.8/libdjvu/GException.cpp.orig	Tue Jul 30 05:50:42 2002
-+++ djvulibre-3.5.8/libdjvu/GException.cpp	Fri Oct 11 00:57:50 2002
-@@ -265,7 +265,7 @@
- #if !defined(WIN32) && !defined(__CYGWIN32__)
- // In general this is a bad idea since statics won't get initialized
- // under WINDOWS, even with CYGWIN.
--static void (*old_handler)() = set_new_handler(throw_memory_error);
-+static void (*old_handler)() = std::set_new_handler(throw_memory_error);
- #endif // ! WIN32
- #endif // !_MSC_VER
- #endif // !NEED_DJVU_MEMORY
diff --git a/djvulibre-nostrip.patch b/djvulibre-nostrip.patch
new file mode 100644
index 0000000..45db85b
--- /dev/null
+++ b/djvulibre-nostrip.patch
@@ -0,0 +1,22 @@
+--- djvulibre-3.5.9/gui/djview/Makefile.in.orig	Fri Oct 11 20:39:33 2002
++++ djvulibre-3.5.9/gui/djview/Makefile.in	Fri Oct 11 21:02:22 2002
+@@ -181,7 +181,7 @@
+ 
+ install-bin: ${PROGRAM} FORCE
+ 	${INSTALL} -d ${DESTDIR}${bindir}
+-	${INSTALL} -s -m 0755 ${PROGRAM} ${DESTDIR}${bindir}
++	${INSTALL} -m 0755 ${PROGRAM} ${DESTDIR}${bindir}
+ 
+ install-man: FORCE
+ 	${INSTALL} -d ${DESTDIR}${mandir}/man1
+--- djvulibre-3.5.9/tools/Makefile.in.orig	Fri Oct 11 20:39:33 2002
++++ djvulibre-3.5.9/tools/Makefile.in	Fri Oct 11 21:02:37 2002
+@@ -67,7 +67,7 @@
+ install-bin: ${PROGRAMS} FORCE
+ 	${INSTALL} -d ${DESTDIR}${bindir}
+ 	for n in ${PROGRAMS} ; do \
+-	  ${INSTALL} -s -m 0755 $$n ${DESTDIR}${bindir} || exit ; done
++	  ${INSTALL} -m 0755 $$n ${DESTDIR}${bindir} || exit ; done
+ 
+ install-man: FORCE
+ 	${INSTALL} -d ${DESTDIR}${mandir}/man1
diff --git a/djvulibre.spec b/djvulibre.spec
index 524a031..48a12e1 100644
--- a/djvulibre.spec
+++ b/djvulibre.spec
@@ -1,14 +1,14 @@
 Summary:	DjVu viewers, encoders and utilities.
 Summary(pl):	DjVu - przegl±darki, dekodery oraz narzêdzia.
 Name:		djvulibre
-Version:	3.5.8
-Release:	2
+Version:	3.5.9
+Release:	1
 License:	GPL
 Group:		Applications/Graphics
 Source0:	ftp://ftp.sourceforge.net/pub/sourceforge/djvu/%{name}-%{version}.tar.gz
 Patch0:		%{name}-DESTDIR.patch
 Patch1:		%{name}-opt.patch
-Patch2:		%{name}-gcc3.patch
+Patch2:		%{name}-nostrip.patch
 URL:		http://djvu.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -23,6 +23,12 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		mozdir		/usr/X11R6/lib/mozilla/plugins
 %define		nsdir		/usr/X11R6/lib/netscape/plugins
 
+# compiling by gcc 3.2 with "-O2 -march=athlon" produces djview that only
+# segfaults... maybe miscompilation, but hard to find where :/
+%ifarch athlon
+%define		optflags	-O2 -march=i686
+%endif
+
 %description
 DjVu is a web-centric format and software platform for distributing
 documents and images. DjVu content downloads faster, displays and
-- 
2.44.0