From 8ed9b766cd75ee1db3fc0d71dc7b1016e9ddea52 Mon Sep 17 00:00:00 2001
From: Tomas Smetana <tsmetana@fedoraproject.org>
Date: Jul 20 2009 07:40:40 +0000
Subject: - new upstream version


---

diff --git a/.cvsignore b/.cvsignore
index becb79d..0d12ac7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ocrad-0.17.tar.bz2
+ocrad-0.18.tar.gz
diff --git a/ocrad-0.17-gcc43.patch b/ocrad-0.17-gcc43.patch
deleted file mode 100644
index f5c8de3..0000000
--- a/ocrad-0.17-gcc43.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -up ocrad-0.17/textblock.cc.gcc43 ocrad-0.17/textblock.cc
---- ocrad-0.17/textblock.cc.gcc43	2007-06-29 14:29:13.000000000 +0200
-+++ ocrad-0.17/textblock.cc	2008-02-19 19:36:25.000000000 +0100
-@@ -18,6 +18,7 @@
- #include <algorithm>
- #include <cstdio>
- #include <vector>
-+#include <string>
- 
- #include "common.h"
- #include "rational.h"
-diff -up ocrad-0.17/page_image_layout.cc.gcc43 ocrad-0.17/page_image_layout.cc
---- ocrad-0.17/page_image_layout.cc.gcc43	2007-06-29 14:29:13.000000000 +0200
-+++ ocrad-0.17/page_image_layout.cc	2008-02-19 19:36:25.000000000 +0100
-@@ -18,6 +18,8 @@
- #include <algorithm>
- #include <cstdio>
- #include <vector>
-+#include <cstdlib>
-+#include <string>
- 
- #include "common.h"
- #include "rational.h"
-diff -up ocrad-0.17/track.cc.gcc43 ocrad-0.17/track.cc
---- ocrad-0.17/track.cc.gcc43	2008-02-19 19:37:08.000000000 +0100
-+++ ocrad-0.17/track.cc	2008-02-19 19:37:30.000000000 +0100
-@@ -17,6 +17,7 @@
- 
- #include <algorithm>
- #include <vector>
-+#include <cstdio>
- 
- #include "common.h"
- #include "rectangle.h"
-diff -up ocrad-0.17/textline.cc.gcc43 ocrad-0.17/textline.cc
---- ocrad-0.17/textline.cc.gcc43	2007-06-29 14:29:13.000000000 +0200
-+++ ocrad-0.17/textline.cc	2008-02-19 19:36:25.000000000 +0100
-@@ -19,6 +19,7 @@
- #include <cctype>
- #include <cstdio>
- #include <vector>
-+#include <string>
- 
- #include "common.h"
- #include "rational.h"
-diff -up ocrad-0.17/common.cc.gcc43 ocrad-0.17/common.cc
---- ocrad-0.17/common.cc.gcc43	2007-06-29 14:29:13.000000000 +0200
-+++ ocrad-0.17/common.cc	2008-02-19 19:36:25.000000000 +0100
-@@ -17,6 +17,7 @@
- 
- #include <algorithm>
- #include <cstdio>
-+#include <cstring>
- #include <cstdlib>
- #include "common.h"
- 
-diff -up ocrad-0.17/textpage.cc.gcc43 ocrad-0.17/textpage.cc
---- ocrad-0.17/textpage.cc.gcc43	2007-06-29 14:29:13.000000000 +0200
-+++ ocrad-0.17/textpage.cc	2008-02-19 19:36:25.000000000 +0100
-@@ -18,6 +18,7 @@
- #include <cstdio>
- #include <string>
- #include <vector>
-+#include <algorithm>
- 
- #include "common.h"
- #include "rectangle.h"
-diff -up ocrad-0.17/textline_r2.cc.gcc43 ocrad-0.17/textline_r2.cc
---- ocrad-0.17/textline_r2.cc.gcc43	2007-06-29 14:29:13.000000000 +0200
-+++ ocrad-0.17/textline_r2.cc	2008-02-19 19:36:25.000000000 +0100
-@@ -18,6 +18,7 @@
- #include <cctype>
- #include <cstdio>
- #include <vector>
-+#include <cstdlib>
- 
- #include "common.h"
- #include "rectangle.h"
-diff -up ocrad-0.17/page_image.cc.gcc43 ocrad-0.17/page_image.cc
---- ocrad-0.17/page_image.cc.gcc43	2007-06-29 14:29:13.000000000 +0200
-+++ ocrad-0.17/page_image.cc	2008-02-19 19:36:25.000000000 +0100
-@@ -19,6 +19,8 @@
- #include <cctype>
- #include <cstdio>
- #include <vector>
-+#include <climits>
-+#include <string>
- 
- #include "common.h"
- #include "rational.h"
-diff -up ocrad-0.17/character_r12.cc.gcc43 ocrad-0.17/character_r12.cc
---- ocrad-0.17/character_r12.cc.gcc43	2007-06-29 14:29:13.000000000 +0200
-+++ ocrad-0.17/character_r12.cc	2008-02-19 19:36:25.000000000 +0100
-@@ -17,6 +17,7 @@
- 
- #include <cstdio>
- #include <vector>
-+#include <cstdlib>
- #include "common.h"
- #include "rectangle.h"
- #include "ucs.h"
diff --git a/ocrad.spec b/ocrad.spec
index be2aa36..f0a9606 100644
--- a/ocrad.spec
+++ b/ocrad.spec
@@ -1,11 +1,10 @@
 Summary: An Optical Character Recognition program
 Name: ocrad
-Version: 0.17
-Release: 4%{?dist}
+Version: 0.18
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Multimedia
-Source: ftp://ftp.gnu.org/gnu/ocrad/%{name}-%{version}.tar.bz2
-Patch0: ocrad-0.17-gcc43.patch
+Source: ftp://ftp.gnu.org/gnu/ocrad/%{name}-%{version}.tar.gz
 URL: http://www.gnu.org/software/ocrad/ocrad.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
@@ -22,7 +21,6 @@ other programs.
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc43
 
 %build
 %configure
@@ -54,6 +52,9 @@ fi
 %attr(0644,root,root) %{_infodir}/ocrad.info.gz
 
 %changelog
+* Mon Jul 20 2009 Tomas Smetana <tsmetana@redhat.com> 0.18-1
+- new upstream version
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.17-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index 843b1b0..f55d6b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-687c213b3334d5a6c2dcef97805c5882  ocrad-0.17.tar.bz2
+5d2d39e218d7f219e53c08ce07556d66  ocrad-0.18.tar.gz