rpms/highlight/devel highlight-2.4-rpmoptflags.patch, 1.4, 1.5 highlight.spec, 1.14, 1.15 sources, 1.6, 1.7 highlight-2.4-gcc41.patch, 1.1, NONE

[Jochen Schmitt (s4504kr)]

Author: s4504kr

Update of /cvs/extras/rpms/highlight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7235

Modified Files:
	highlight-2.4-rpmoptflags.patch highlight.spec sources 
Removed Files:
	highlight-2.4-gcc41.patch 
Log Message:
New upstream release

highlight-2.4-rpmoptflags.patch:

Index: highlight-2.4-rpmoptflags.patch
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/highlight-2.4-rpmoptflags.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- highlight-2.4-rpmoptflags.patch	12 Mar 2006 20:09:47 -0000	1.4
+++ highlight-2.4-rpmoptflags.patch	4 Jul 2006 19:00:09 -0000	1.5
@@ -1,11 +1,11 @@
---- highlight-2.4.4/highlight/makefile.org	2006-03-12 21:02:07.000000000 +0100
-+++ highlight-2.4.4/highlight/makefile	2006-03-12 21:03:13.000000000 +0100
+--- highlight-2.4.7/highlight/makefile.org	2006-07-04 20:50:59.000000000 +0200
++++ highlight-2.4.7/highlight/makefile	2006-07-04 20:51:53.000000000 +0200
 @@ -15,7 +15,7 @@
  
  CXX=c++
  
--CFLAGS := -O2 -DHL_DATA_DIR=\"${HL_DATA_DIR}\"
-+CFLAGS := ${RPM_OPT_FLAGS} -O2 -DHL_DATA_DIR=\"${HL_DATA_DIR}\"
- #CFLAGS := -Wall -DHL_DATA_DIR=\"${HL_DATA_DIR}\"
+-CFLAGS := -O2 -DHL_DATA_DIR=\"${HL_DATA_DIR}\" 
++CFLAGS := ${RPM_OPT_FLAGS} -O2 -DHL_DATA_DIR=\"${HL_DATA_DIR}\" 
+ #CFLAGS := -Wall -DHL_DATA_DIR=\"${HL_DATA_DIR}\" -ggdb
  
  LDFLAGS = -s


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- highlight.spec	22 Mar 2006 17:22:58 -0000	1.14
+++ highlight.spec	4 Jul 2006 19:00:09 -0000	1.15
@@ -1,7 +1,7 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.4.5
-Release:	2%{?dist}
+Version:	2.4.7
+Release:	1%{?dist}
 
 Group:		Development/Tools
 License:	GPL
@@ -9,8 +9,7 @@
 URL:		http://www.andre-simon.de/
 Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
 Patch1:		highlight-2.4-makefile.patch
-Patch2:		highlight-2.4-rpmoptflags.patch
-Patch3:         highlight-2.4-gcc41.patch
+# Patch2:		highlight-2.4-rpmoptflags.patch
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -25,8 +24,7 @@
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
+# %patch2 -p1
 
 %build
 make %{?_smp_mflags} LDFLAGS=
@@ -51,6 +49,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Tue Jul  4 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.7-1
+- New upstream release
+
 * Wed Mar 22 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.5-2
 - New upstream relase
 - Add gcc41 patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Mar 2006 16:31:13 -0000	1.6
+++ sources	4 Jul 2006 19:00:09 -0000	1.7
@@ -1 +1 @@
-c62385c80fd0088a7798875aa0f9a460  highlight-2.4.5.tar.gz
+43557684e05d6d2a1144bffcf9f30871  highlight-2.4.7.tar.gz


--- highlight-2.4-gcc41.patch DELETED ---