From b3bab2f28ba25ba1df6ceb6c26d78ac4e812a3f1 Mon Sep 17 00:00:00 2001
From: Jochen Schmitt <s4504kr@fedoraproject.org>
Date: Oct 14 2008 15:43:03 +0000
Subject: New upstream release


---

diff --git a/highlight-2.6.13-gcc43.patch b/highlight-2.6.13-gcc43.patch
new file mode 100644
index 0000000..ff85896
--- /dev/null
+++ b/highlight-2.6.13-gcc43.patch
@@ -0,0 +1,37 @@
+diff -up highlight-2.6.13/src/main.cpp.gcc43 highlight-2.6.13/src/main.cpp
+--- highlight-2.6.13/src/main.cpp.gcc43	2008-09-30 03:45:45.000000000 +0200
++++ highlight-2.6.13/src/main.cpp	2008-10-14 17:05:53.000000000 +0200
+@@ -23,6 +23,9 @@
+ #include "main.h"
+ #include "re/Pattern.h"
+ 
++#include <algorithm>
++#include <memory>
++
+ #define MAX_LINE__WIDTH       80
+ 
+ using namespace std;
+diff -up highlight-2.6.13/src/makefile.gcc43 highlight-2.6.13/src/makefile
+--- highlight-2.6.13/src/makefile.gcc43	2008-10-14 17:25:04.000000000 +0200
++++ highlight-2.6.13/src/makefile	2008-10-14 17:26:42.000000000 +0200
+@@ -69,7 +69,7 @@ endif
+ compile: ${OBJECTFILES} libhighlight.a
+ 	${BUILD_CMD}
+ 
+-libhighlight.a:
++libhighlight.a: ${CORE_OBJECTS}
+ 	echo "compile lib...."
+ 	${AR} ${ARFLAGS} libhighlight.a ${CORE_OBJECTS}
+ 
+diff -up highlight-2.6.13/src/platform_fs.cpp.gcc43 highlight-2.6.13/src/platform_fs.cpp
+--- highlight-2.6.13/src/platform_fs.cpp.gcc43	2008-09-10 21:34:37.000000000 +0200
++++ highlight-2.6.13/src/platform_fs.cpp	2008-10-14 17:05:53.000000000 +0200
+@@ -36,6 +36,8 @@
+ #include <iostream>
+ #include <errno.h>
+ 
++#include <algorithm>
++
+ using namespace std;
+ 
+ namespace Platform {
diff --git a/highlight.spec b/highlight.spec
index c3e269f..f4b59c5 100644
--- a/highlight.spec
+++ b/highlight.spec
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.6.12
+Version:	2.6.13
 Release:	2%{?dist}
 
 Group:		Development/Tools
@@ -9,6 +9,8 @@ License:	GPLv2
 URL:		http://www.andre-simon.de/
 Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
 Patch1:		highlight-2.6.11-makefile.patch
+# Patch forwarded to upstream via email
+Patch2:		highlight-2.6.13-gcc43.patch
 
 BuildRequires:	wxGTK-devel
 
@@ -25,6 +27,7 @@ It is easily possible to create new language definitions and colour themes.
 %prep
 %setup -q
 %patch1 -p1 -b .mak
+%patch2 -p1 -b .gcc43
 
 # Provides: exclude perl(highlight_pipe) from example
 cat <<__EOF__ > %{name}-perl.prov
@@ -70,6 +73,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Tue Oct 14 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.13-2
+- Fix SMP build issue
+
+* Wed Oct  8 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.13-1
+- New upstream release
+
 * Thu Sep 11 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.6.12-2
 - don't package broken examples, causes bogus perl provides/requires
 - don't claim to Provide: perl(highlight_pipe)
@@ -77,6 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Aug 18 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.12-1
 - New upstream release
+- Fix for gcc-4.3 issue on highlight-2.6.13
 
 * Thu Jul 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.11-1
 - New upstream release
diff --git a/sources b/sources
index f1fbaee..3e8dca6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5ab9c50e537c199f359a7d9610aacc7f  highlight-2.6.12.tar.gz
+be68c98d3726a5b5a1c29704147186a4  highlight-2.6.13.tar.gz