diff --git a/.cvsignore b/.cvsignore index 82c3f20..eb35e37 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -highlight-2.6.11.tar.gz +highlight-2.6.12.tar.gz diff --git a/highlight-2.6.11-gcc43.patch b/highlight-2.6.11-gcc43.patch deleted file mode 100644 index 732a6c3..0000000 --- a/highlight-2.6.11-gcc43.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 - #include - -+#include -+ - 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 -+#include -+ - //-> 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 - - using namespace std; - diff --git a/highlight.spec b/highlight.spec index 7027e6b..77230eb 100644 --- a/highlight.spec +++ b/highlight.spec @@ -1,6 +1,6 @@ Name: highlight Summary: Universal source code to formatted text converter -Version: 2.6.11 +Version: 2.6.12 Release: 1%{?dist} Group: Development/Tools @@ -9,7 +9,8 @@ License: GPLv2 URL: http://www.andre-simon.de/ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz Patch1: highlight-2.6.11-makefile.patch -Patch3: highlight-2.6.11-gcc43.patch + +BuildRequires: wxGTK-devel Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -24,7 +25,6 @@ It is easily possible to create new language definitions and colour themes. %prep %setup -q %patch1 -p1 -b .mak -%patch3 -p1 -b .gcc43 %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS= @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Mon Aug 18 2008 Jochen Schmitt 2.6.12-1 +- New upstream release + * Thu Jul 17 2008 Jochen Schmitt 2.6.11-1 - New upstream release diff --git a/sources b/sources index 4ef7e96..f1fbaee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9bc25b076d90b5e0be5df5617e753fc9 highlight-2.6.11.tar.gz +5ab9c50e537c199f359a7d9610aacc7f highlight-2.6.12.tar.gz