New upstream release
This commit is contained in:
parent
93705bd437
commit
92167877bf
@ -1 +1 @@
|
|||||||
highlight-2.6.12.tar.gz
|
highlight-2.6.13.tar.gz
|
||||||
|
25
highlight-2.6.13-gcc43.patch
Normal file
25
highlight-2.6.13-gcc43.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
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
|
||||||
|
@@ -23,6 +23,9 @@
|
||||||
|
#include "main.h"
|
||||||
|
#include "re/Pattern.h"
|
||||||
|
|
||||||
|
+#include <algorithm>
|
||||||
|
+#include <memory>
|
||||||
|
+
|
||||||
|
#define MAX_LINE__WIDTH 80
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
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
|
||||||
|
@@ -36,6 +36,8 @@
|
||||||
|
#include <iostream>
|
||||||
|
#include <errno.h>
|
||||||
|
|
||||||
|
+#include <algorithm>
|
||||||
|
+
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
|
namespace Platform {
|
@ -1,7 +1,7 @@
|
|||||||
Name: highlight
|
Name: highlight
|
||||||
Summary: Universal source code to formatted text converter
|
Summary: Universal source code to formatted text converter
|
||||||
Version: 2.6.12
|
Version: 2.6.13
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
@ -9,6 +9,8 @@ License: GPLv2
|
|||||||
URL: http://www.andre-simon.de/
|
URL: http://www.andre-simon.de/
|
||||||
Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
|
Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
|
||||||
Patch1: highlight-2.6.11-makefile.patch
|
Patch1: highlight-2.6.11-makefile.patch
|
||||||
|
# Patch forwarded to upstream via email
|
||||||
|
Patch2: highlight-2.6.13-gcc43.patch
|
||||||
|
|
||||||
BuildRequires: wxGTK-devel
|
BuildRequires: wxGTK-devel
|
||||||
|
|
||||||
@ -25,6 +27,7 @@ It is easily possible to create new language definitions and colour themes.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1 -b .mak
|
%patch1 -p1 -b .mak
|
||||||
|
%patch2 -p1 -b .gcc43
|
||||||
|
|
||||||
# Provides: exclude perl(highlight_pipe) from example
|
# Provides: exclude perl(highlight_pipe) from example
|
||||||
cat <<__EOF__ > %{name}-perl.prov
|
cat <<__EOF__ > %{name}-perl.prov
|
||||||
@ -70,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%doc ChangeLog AUTHORS README* COPYING TODO examples/
|
%doc ChangeLog AUTHORS README* COPYING TODO examples/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 8 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.13-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.6.12-2
|
* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.6.12-2
|
||||||
- don't package broken examples, causes bogus perl provides/requires
|
- don't package broken examples, causes bogus perl provides/requires
|
||||||
- don't claim to Provide: perl(highlight_pipe)
|
- don't claim to Provide: perl(highlight_pipe)
|
||||||
@ -77,6 +83,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
* Mon Aug 18 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.12-1
|
* Mon Aug 18 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.12-1
|
||||||
- New upstream release
|
- New upstream release
|
||||||
|
- Fix for gcc-4.3 issue on highlight-2.6.13
|
||||||
|
|
||||||
* Thu Jul 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.11-1
|
* Thu Jul 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.11-1
|
||||||
- New upstream release
|
- New upstream release
|
||||||
|
Loading…
Reference in New Issue
Block a user