From 17ef6d4d2a3181625de106da49f409fc427e3446 Mon Sep 17 00:00:00 2001
From: Jochen Schmitt <s4504kr@fedoraproject.org>
Date: Tue, 11 Sep 2007 19:29:48 +0000
Subject: [PATCH] New upstream release

---
 .cvsignore                    |  2 +-
 highlight-2.6.2-rpmopts.patch | 11 -----------
 highlight-2.6.3-rpmopts.patch | 12 ++++++++++++
 highlight.spec                |  7 +++++--
 sources                       |  2 +-
 5 files changed, 19 insertions(+), 15 deletions(-)
 delete mode 100644 highlight-2.6.2-rpmopts.patch
 create mode 100644 highlight-2.6.3-rpmopts.patch

diff --git a/.cvsignore b/.cvsignore
index c6457e4..d836532 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-highlight-2.6.2.tar.gz
+highlight-2.6.3.tar.gz
diff --git a/highlight-2.6.2-rpmopts.patch b/highlight-2.6.2-rpmopts.patch
deleted file mode 100644
index b6d5b77..0000000
--- a/highlight-2.6.2-rpmopts.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- highlight-2.6.2/src/makefile.bak	2007-07-19 22:19:31.000000000 +0200
-+++ highlight-2.6.2/src/makefile	2007-08-09 17:13:26.000000000 +0200
-@@ -15,7 +15,7 @@
- 
- CXX=c++
- 
--CFLAGS := -O2
-+CFLAGS := ${RPM_OPT_FLAGS}
- LDFLAGS = -s
- 
- CXX_COMPILE = ${CXX} ${CFLAGS} -c
diff --git a/highlight-2.6.3-rpmopts.patch b/highlight-2.6.3-rpmopts.patch
new file mode 100644
index 0000000..ff189d4
--- /dev/null
+++ b/highlight-2.6.3-rpmopts.patch
@@ -0,0 +1,12 @@
+diff -up highlight-2.6.3/src/makefile.bak highlight-2.6.3/src/makefile
+--- highlight-2.6.3/src/makefile.bak	2007-09-04 23:25:34.000000000 +0200
++++ highlight-2.6.3/src/makefile	2007-09-11 21:26:50.000000000 +0200
+@@ -15,7 +15,7 @@
+ 
+ CXX=c++
+ 
+-CFLAGS := -O2
++CFLAGS := ${RPM_OPT_FLAGS}
+ 
+ # Do not strip by default (Mac OS X lazy pointer issues)
+ # Add -static to avoid linking with shared libs (can cause trouble when highlight
diff --git a/highlight.spec b/highlight.spec
index e006556..2cca974 100644
--- a/highlight.spec
+++ b/highlight.spec
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.6.2
+Version:	2.6.3
 Release:	1%{?dist}
 
 Group:		Development/Tools
@@ -9,7 +9,7 @@ License:	GPLv2
 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.2-rpmopts.patch
+Patch2:		highlight-2.6.3-rpmopts.patch
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Tue Sep 11 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.3-1
+- New upstream release
+
 * Thu Aug  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.2-1
 - New upstream release
 
diff --git a/sources b/sources
index 2a39bfe..4758800 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9f024bb8898b1ba2f92f6966ab6978c8  highlight-2.6.2.tar.gz
+0dd32cf9a2f8c6bfeb3976b89a50b445  highlight-2.6.3.tar.gz