rpms/highlight/devel highlight-2.6.13-gcc43.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 highlight.spec, 1.34, 1.35 sources, 1.20, 1.21

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/extras/rpms/highlight/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5874

Modified Files:
	.cvsignore highlight.spec sources 
Added Files:
	highlight-2.6.13-gcc43.patch 
Log Message:
New upstream release

highlight-2.6.13-gcc43.patch:

--- NEW FILE highlight-2.6.13-gcc43.patch ---
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-10-08 20:08:10.000000000 +0200
+++ highlight-2.6.13/src/main.cpp	2008-10-08 20:09:08.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/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-08 20:07:37.000000000 +0200
@@ -36,6 +36,8 @@
 #include <iostream>
 #include <errno.h>
 
+#include <algorithm>
+
 using namespace std;
 
 namespace Platform {


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	7 Sep 2008 20:06:05 -0000	1.19
+++ .cvsignore	8 Oct 2008 18:19:22 -0000	1.20
@@ -1 +1 @@
-highlight-2.6.12.tar.gz
+highlight-2.6.13.tar.gz


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- highlight.spec	11 Sep 2008 18:31:02 -0000	1.34
+++ highlight.spec	8 Oct 2008 18:19:22 -0000	1.35
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.6.12
-Release:	2%{?dist}
+Version:	2.6.13
+Release:	1%{?dist}
 
 Group:		Development/Tools
 License:	GPLv2
@@ -9,6 +9,8 @@
 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 @@
 %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,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* 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 at 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 +83,7 @@
 
 * 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	7 Sep 2008 20:06:06 -0000	1.20
+++ sources	8 Oct 2008 18:19:22 -0000	1.21
@@ -1 +1 @@
-5ab9c50e537c199f359a7d9610aacc7f  highlight-2.6.12.tar.gz
+be68c98d3726a5b5a1c29704147186a4  highlight-2.6.13.tar.gz