rpms/highlight/F-7 highlight-2.6.7-gcc43.patch, NONE, 1.1 highlight.spec, 1.23, 1.24 sources, 1.13, 1.14 highlight-2.6.3-rpmopts.patch, 1.1, NONE

[Jochen Schmitt (s4504kr)]

Author: s4504kr

Update of /cvs/extras/rpms/highlight/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10457

Modified Files:
	highlight.spec sources 
Added Files:
	highlight-2.6.7-gcc43.patch 
Removed Files:
	highlight-2.6.3-rpmopts.patch 
Log Message:
New upstream release

highlight-2.6.7-gcc43.patch:

--- NEW FILE highlight-2.6.7-gcc43.patch ---
diff -up highlight-2.6.7/src/astyle/astyle.h.gcc43 highlight-2.6.7/src/astyle/astyle.h
--- highlight-2.6.7/src/astyle/astyle.h.gcc43	2007-07-19 22:23:37.000000000 +0200
+++ highlight-2.6.7/src/astyle/astyle.h	2008-01-21 18:18:16.000000000 +0100
@@ -38,6 +38,8 @@
 #include <vector>
 #include <cctype>
 
+#include <cstring>
+
 using namespace std;
 
 
diff -up highlight-2.6.7/src/codegenerator.cpp.gcc43 highlight-2.6.7/src/codegenerator.cpp
--- highlight-2.6.7/src/codegenerator.cpp.gcc43	2008-01-01 21:34:56.000000000 +0100
+++ highlight-2.6.7/src/codegenerator.cpp	2008-01-21 18:18:16.000000000 +0100
@@ -27,6 +27,9 @@
 #include "re/Matcher.h"
 #include "astyle/astyle.h"
 
+#include <climits>
+#include <memory>
+
 //-> siehe wx/defs.h
 #ifndef __WXWINDOWS__
   #include "ansigenerator.h"
diff -up highlight-2.6.7/src/languagedefinition.cpp.gcc43 highlight-2.6.7/src/languagedefinition.cpp
--- highlight-2.6.7/src/languagedefinition.cpp.gcc43	2008-01-21 18:24:27.000000000 +0100
+++ highlight-2.6.7/src/languagedefinition.cpp	2008-01-21 18:24:48.000000000 +0100
@@ -18,6 +18,7 @@
 #include "languagedefinition.h"
 #include "stringtools.h"
 
+#include <memory>
 
 using namespace std;
 


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-7/highlight.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- highlight.spec	11 Dec 2007 19:40:29 -0000	1.23
+++ highlight.spec	21 Jan 2008 17:59:31 -0000	1.24
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.6.6
-Release:	1%{?dist}
+Version:	2.6.7
+Release:	2%{?dist}
 
 Group:		Development/Tools
 License:	GPLv2
@@ -9,7 +9,7 @@
 URL:		http://www.andre-simon.de/
 Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
 Patch1:		highlight-2.6.1-makefile.patch
-Patch2:		highlight-2.6.3-rpmopts.patch
+Patch3:         highlight-2.6.7-gcc43.patch
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -24,10 +24,10 @@
 %prep
 %setup -q
 %patch1 -p1 -b .mak
-%patch2 -p1 -b .bak
+%patch3 -p1 -b .gcc43
 
 %build
-make %{?_smp_mflags} LDFLAGS=
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -49,9 +49,16 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Mon Jan 21 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.7-2
+- New upstream release
+- Fix gcc-4.3 issues
+
 * Tue Dec 11 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.6-1
 - New upstream release
 
+* Mon Oct 29 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.5-1
+- New upstream release
+
 * Sun Sep 16 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.4-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-7/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	11 Dec 2007 19:40:29 -0000	1.13
+++ sources	21 Jan 2008 17:59:31 -0000	1.14
@@ -1 +1 @@
-b6e25243ba0261e11e1f4cf37c4add2c  highlight-2.6.6.tar.gz
+2200bdc03b47ce94a097fefd9bd5ee33  highlight-2.6.7.tar.gz


--- highlight-2.6.3-rpmopts.patch DELETED ---