From 7d51262bfcb512c497f141b728b01a78782c43fb Mon Sep 17 00:00:00 2001
From: Jochen Schmitt <s4504kr@fedoraproject.org>
Date: Jul 04 2006 19:00:09 +0000
Subject: New upstream release


---

diff --git a/highlight-2.4-gcc41.patch b/highlight-2.4-gcc41.patch
deleted file mode 100644
index df1fea2..0000000
--- a/highlight-2.4-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- highlight-2.4.5/highlight/codegenerator.h.org	2006-03-22 17:45:01.000000000 +0100
-+++ highlight-2.4.5/highlight/codegenerator.h	2006-03-22 17:50:02.000000000 +0100
-@@ -248,7 +248,7 @@
-     string &getTitle();
- 
-     /** \param p HTML anchor prefix */
--    void CodeGenerator::setHTMLAnchorPrefix(const string & p);
-+    void setHTMLAnchorPrefix(const string & p);
- 
- protected:
-     CodeGenerator(highlight::OutputType type);
diff --git a/highlight-2.4-rpmoptflags.patch b/highlight-2.4-rpmoptflags.patch
index a2bf139..0d26bb6 100644
--- a/highlight-2.4-rpmoptflags.patch
+++ b/highlight-2.4-rpmoptflags.patch
@@ -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
diff --git a/highlight.spec b/highlight.spec
index 4ee8744..8c0cc37 100644
--- a/highlight.spec
+++ b/highlight.spec
@@ -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 @@ License:	GPL
 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 @@ It is easily possible to create new language definitions and colour themes.
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
+# %patch2 -p1
 
 %build
 make %{?_smp_mflags} LDFLAGS=
@@ -51,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %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
diff --git a/sources b/sources
index f394d6e..000bcd2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c62385c80fd0088a7798875aa0f9a460  highlight-2.4.5.tar.gz
+43557684e05d6d2a1144bffcf9f30871  highlight-2.4.7.tar.gz