rpms/highlight/F-8 highlight-2.6.11-gcc43.patch, NONE, 1.1 highlight-2.6.11-makefile.patch, NONE, 1.1 highlight.spec, 1.28, 1.29 sources, 1.17, 1.18 highlight-2.6.7-gcc43.patch, 1.1, NONE highlight-2.6.9-makefile.patch, 1.1, NONE

Jochen Schmitt (s4504kr) fedora-extras-commits at redhat.com
Thu Jul 17 15:45:23 UTC 2008


Author: s4504kr

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

Modified Files:
	highlight.spec sources 
Added Files:
	highlight-2.6.11-gcc43.patch highlight-2.6.11-makefile.patch 
Removed Files:
	highlight-2.6.7-gcc43.patch highlight-2.6.9-makefile.patch 
Log Message:
New upstream release

highlight-2.6.11-gcc43.patch:

--- NEW FILE highlight-2.6.11-gcc43.patch ---
diff -up highlight-2.6.11/src/astyle/astyle.h.gcc43 highlight-2.6.11/src/astyle/astyle.h
--- highlight-2.6.11/src/astyle/astyle.h.gcc43	2008-01-24 01:41:01.000000000 +0100
+++ highlight-2.6.11/src/astyle/astyle.h	2008-07-17 17:27:43.000000000 +0200
@@ -39,6 +39,8 @@
 #include <cctype>
 #include <cstring>
 
+#include <cstring>
+
 using namespace std;
 
 
diff -up highlight-2.6.11/src/codegenerator.cpp.gcc43 highlight-2.6.11/src/codegenerator.cpp
--- highlight-2.6.11/src/codegenerator.cpp.gcc43	2008-06-27 03:53:10.000000000 +0200
+++ highlight-2.6.11/src/codegenerator.cpp	2008-07-17 17:27:43.000000000 +0200
@@ -31,6 +31,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.11/src/languagedefinition.cpp.gcc43 highlight-2.6.11/src/languagedefinition.cpp
--- highlight-2.6.11/src/languagedefinition.cpp.gcc43	2008-07-05 04:14:25.000000000 +0200
+++ highlight-2.6.11/src/languagedefinition.cpp	2008-07-17 17:27:43.000000000 +0200
@@ -20,6 +20,7 @@
 #include "languagedefinition.h"
 #include "stringtools.h"
 
+#include <memory>
 
 using namespace std;
 

highlight-2.6.11-makefile.patch:

--- NEW FILE highlight-2.6.11-makefile.patch ---
diff -up highlight-2.6.9/makefile.mak highlight-2.6.9/makefile
--- highlight-2.6.9/makefile.mak	2008-03-26 22:17:36.000000000 +0100
+++ highlight-2.6.9/makefile	2008-03-31 20:40:34.000000000 +0200
@@ -51,21 +51,12 @@ all-gui-wx29:
 install:
 	@echo "This script will install highlight in the following directories:"
 	@echo "Data directory:	        ${DESTDIR}${data_dir}"
-	@echo "Documentation directory: ${DESTDIR}${doc_dir}"
-	@echo "Examples directory:      ${DESTDIR}${examples_dir}"
 	@echo "Manual directory:        ${DESTDIR}${man_dir}"
 	@echo "Binary directory:        ${DESTDIR}${bin_dir}"
 	@echo "Configuration directory: ${DESTDIR}${conf_dir}"
 	@echo
 
-	${MKDIR} ${DESTDIR}${doc_dir}
 	${MKDIR} ${DESTDIR}${conf_dir}
-	${MKDIR} ${DESTDIR}${examples_dir} \
-		${DESTDIR}${examples_dir}plugins \
-		${DESTDIR}${examples_dir}plugins/dokuwiki \
-		${DESTDIR}${examples_dir}plugins/movabletype \
-		${DESTDIR}${examples_dir}plugins/wordpress \
-		${DESTDIR}${examples_dir}swig
 	${MKDIR} ${DESTDIR}${data_dir} \
 		${DESTDIR}${data_dir}themes \
 		${DESTDIR}${data_dir}langDefs \
@@ -80,22 +71,6 @@ install:
 	${INSTALL_DATA} ./indentSchemes/*.indent ${DESTDIR}${data_dir}indentSchemes/
 	${INSTALL_DATA} ./helpmsg/*.help ${DESTDIR}${data_dir}helpmsg/
 	${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir}
-	${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./README ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./README_INDENT ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./README_REGEX ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./README_LANGLIST ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./ChangeLog ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./COPYING ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./INSTALL ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./examples/plugins/dokuwiki/* ${DESTDIR}${examples_dir}plugins/dokuwiki/
-	${INSTALL_DATA} ./examples/plugins/movabletype/* ${DESTDIR}${examples_dir}plugins/movabletype/
-	${INSTALL_DATA} ./examples/plugins/wordpress/* ${DESTDIR}${examples_dir}plugins/wordpress/
-	${INSTALL_DATA} ./examples/swig/*.py ./examples/swig/*.pl ${DESTDIR}${examples_dir}swig
-	${INSTALL_DATA} ./examples/swig/*.i ./examples/swig/makefile ${DESTDIR}${examples_dir}swig
-	${INSTALL_DATA} ./examples/swig/README_SWIG ${DESTDIR}${doc_dir}
-	${INSTALL_DATA} ./examples/highlight_pipe.* ${DESTDIR}${examples_dir}
 	${INSTALL_PROGRAM} ./src/highlight ${DESTDIR}${bin_dir}
 
 	@echo
@@ -121,7 +96,6 @@ install-gui:
 uninstall:
 	@echo "Removing highlight files from system..."
 	${RMDIR} ${DESTDIR}${data_dir}
-	${RMDIR} ${DESTDIR}${doc_dir}
 	${RMDIR} ${DESTDIR}${conf_dir}
 	${RMDIR} ${DESTDIR}${examples_dir}
 	rm ${DESTDIR}${man_dir}highlight.1.gz


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-8/highlight.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- highlight.spec	12 May 2008 18:37:55 -0000	1.28
+++ highlight.spec	17 Jul 2008 15:44:23 -0000	1.29
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.6.10
+Version:	2.6.11
 Release:	1%{?dist}
 
 Group:		Development/Tools
@@ -8,8 +8,8 @@
 
 URL:		http://www.andre-simon.de/
 Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
-Patch1:		highlight-2.6.9-makefile.patch
-Patch3:         highlight-2.6.7-gcc43.patch
+Patch1:		highlight-2.6.11-makefile.patch
+Patch3:         highlight-2.6.11-gcc43.patch
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -49,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Thu Jul 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.11-1
+- New upstream release
+
 * Mon May 12 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.10-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/F-8/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	12 May 2008 18:37:55 -0000	1.17
+++ sources	17 Jul 2008 15:44:23 -0000	1.18
@@ -1 +1 @@
-2f528053278cc7fe104516623e948cef  highlight-2.6.10.tar.gz
+9bc25b076d90b5e0be5df5617e753fc9  highlight-2.6.11.tar.gz


--- highlight-2.6.7-gcc43.patch DELETED ---


--- highlight-2.6.9-makefile.patch DELETED ---




More information about the fedora-extras-commits mailing list