rpms/highlight/F-8 highlight-2.6.13-gcc43.patch, NONE, 1.1 highlight.spec, 1.31, 1.32 sources, 1.19, 1.20

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/extras/rpms/highlight/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25666

Modified Files:
	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-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 {


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-8/highlight.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- highlight.spec	15 Sep 2008 17:01:15 -0000	1.31
+++ highlight.spec	14 Oct 2008 15:55:30 -0000	1.32
@@ -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 @@
 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,12 @@
 %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 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 +86,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/F-8/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	8 Sep 2008 15:44:14 -0000	1.19
+++ sources	14 Oct 2008 15:55:30 -0000	1.20
@@ -1 +1 @@
-5ab9c50e537c199f359a7d9610aacc7f  highlight-2.6.12.tar.gz
+be68c98d3726a5b5a1c29704147186a4  highlight-2.6.13.tar.gz