From 02bccc77e7f274aec560b62bcd1b4d3217d4068b Mon Sep 17 00:00:00 2001
From: Jochen Schmitt <s4504kr@fedoraproject.org>
Date: Nov 03 2008 18:55:15 +0000
Subject: New upstream release


---

diff --git a/.cvsignore b/.cvsignore
index ea1ed52..8e9e27d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-highlight-2.6.13.tar.gz
+highlight-2.6.14.tar.gz
diff --git a/highlight-2.6.13-gcc43.patch b/highlight-2.6.13-gcc43.patch
deleted file mode 100644
index ff85896..0000000
--- a/highlight-2.6.13-gcc43.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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 f4b59c5..f273b61 100644
--- a/highlight.spec
+++ b/highlight.spec
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.6.13
-Release:	2%{?dist}
+Version:	2.6.14
+Release:	1%{?dist}
 
 Group:		Development/Tools
 License:	GPLv2
@@ -9,8 +9,6 @@ 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
 
@@ -27,7 +25,6 @@ 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
@@ -73,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Mon Nov  3 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.14-1
+- New upstream release
+
 * Tue Oct 14 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.13-2
 - Fix SMP build issue
 
diff --git a/sources b/sources
index 3e8dca6..10abce7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-be68c98d3726a5b5a1c29704147186a4  highlight-2.6.13.tar.gz
+09bb5bb1d9d9dba215a9d56e02213452  highlight-2.6.14.tar.gz