rpms/highlight/devel highlight-2.6.13-gcc43.patch, 1.1, 1.2 highlight.spec, 1.35, 1.36

Jochen Schmitt s4504kr at fedoraproject.org
Tue Oct 14 15:35:19 UTC 2008


Author: s4504kr

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

Modified Files:
	highlight-2.6.13-gcc43.patch highlight.spec 
Log Message:
Fix SMP build issue

highlight-2.6.13-gcc43.patch:

Index: highlight-2.6.13-gcc43.patch
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/highlight-2.6.13-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- highlight-2.6.13-gcc43.patch	8 Oct 2008 18:19:22 -0000	1.1
+++ highlight-2.6.13-gcc43.patch	14 Oct 2008 15:34:48 -0000	1.2
@@ -1,6 +1,6 @@
 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
+--- 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"
@@ -11,9 +11,21 @@
  #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-08 20:07: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>


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- highlight.spec	8 Oct 2008 18:19:22 -0000	1.35
+++ highlight.spec	14 Oct 2008 15:34:48 -0000	1.36
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
 Version:	2.6.13
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		Development/Tools
 License:	GPLv2
@@ -73,6 +73,9 @@
 %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
 




More information about the scm-commits mailing list