From a0c45cb68136f671abd1fbf6468f36830c8e0396 Mon Sep 17 00:00:00 2001 From: Karol Trzcionka Date: Sat, 16 Jun 2007 13:53:15 +0000 Subject: [PATCH] release tesseract 1.04-1 --- .cvsignore | 1 + sources | 1 + tesseract-1.04-compilefix.patch | 60 ++++++++++++ tesseract-1.04-upstreampatch.patch | 143 +++++++++++++++++++++++++++++ tesseract.spec | 80 ++++++++++++++++ 5 files changed, 285 insertions(+) create mode 100644 tesseract-1.04-compilefix.patch create mode 100644 tesseract-1.04-upstreampatch.patch create mode 100644 tesseract.spec diff --git a/.cvsignore b/.cvsignore index e69de29..65e7460 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +tesseract-1.04.tar.gz diff --git a/sources b/sources index e69de29..66ade32 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +c39bd7b465c37a3863140e88d51cd839 tesseract-1.04.tar.gz diff --git a/tesseract-1.04-compilefix.patch b/tesseract-1.04-compilefix.patch new file mode 100644 index 0000000..8a4cccf --- /dev/null +++ b/tesseract-1.04-compilefix.patch @@ -0,0 +1,60 @@ +--- ./cutil/globals.h.karlik 2006-06-17 00:17:07.000000000 +0200 ++++ ./cutil/globals.h 2006-12-27 16:20:43.000000000 +0100 +@@ -43,8 +43,13 @@ + extern int debugs[MAXPROC]; /*debug flags */ + extern int plots[MAXPROC]; /*plot flags */ + extern int corners[4]; /*corners of scan window */ +-extern int optind; /*option index */ +-extern char *optarg; /*option argument */ ++//extern int optind; /*option index */ ++//extern char *optarg; /*option argument */ ++#ifndef _GETOPT_H ++#define _GETOPT_H 1 ++extern int optind; ++extern char *optarg; ++#endif + /*image file name */ + extern char imagefile[FILENAMESIZE]; + /* main directory */ +--- ./cutil/tordvars.h.karlik 2006-06-17 00:17:07.000000000 +0200 ++++ ./cutil/tordvars.h 2006-12-27 12:54:56.000000000 +0100 +@@ -46,7 +46,10 @@ + extern int write_raw_output; /* Text before context */ + extern int write_output; /* Text file output */ + //extern "C" { extern int display_ratings; } /* Show the ratings */ +-extern int display_ratings; /* Show the ratings */ ++#ifndef tescik ++#define tescik ++extern int display_ratings; /* Show the ratings */ ++#endif + extern int show_bold; /* Use bold text */ + extern int display_text; /* Show word text */ + extern int display_blocks; /* Show word as boxes */ +--- ./ccmain/tfacep.h.karlik 2006-06-17 00:17:03.000000000 +0200 ++++ ./ccmain/tfacep.h 2006-12-27 12:54:53.000000000 +0100 +@@ -103,7 +103,10 @@ + //extern int enable_assoc; + //extern int chop_enable; + //extern int permute_only_top; ++ #ifndef tescik ++#define tescik + extern int display_ratings; ++#endif + + }; + +--- ./ccmain/control.cpp 2007-05-16 02:55:59.000000000 +0200 ++++ ./ccmain/control.cpp 2007-05-23 16:40:17.000000000 +0200 +@@ -148,7 +148,11 @@ + EXTERN double_VAR (test_pt_y, 99999.99, "ycoord"); + + extern int MatcherDebugLevel; +-extern "C" { extern int display_ratings; } ++#ifndef tescik ++#define tescik ++ extern int display_ratings; ++#endif ++//extern "C" { extern int display_ratings; } + extern int number_debug; + extern int adjust_debug; + /* diff --git a/tesseract-1.04-upstreampatch.patch b/tesseract-1.04-upstreampatch.patch new file mode 100644 index 0000000..eab9689 --- /dev/null +++ b/tesseract-1.04-upstreampatch.patch @@ -0,0 +1,143 @@ +diff -r --unified tesseract-1.04/tessdata/Makefile tesseract-1.04b/tessdata/Makefile +--- tesseract-1.04/tessdata/Makefile 2007-05-17 03:51:00.000000000 +0200 ++++ tesseract-1.04b/tessdata/Makefile 2007-05-17 19:51:27.000000000 +0200 +@@ -156,7 +156,7 @@ + sharedstatedir = ${prefix}/com + sysconfdir = ${prefix}/etc + target_alias = +-data_DATA = confsets eng.DangAmbigs eng.freq-dawg eng.inttemp eng.normproto eng.pffmtable eng.user-words eng.word-dawg ++data_DATA = confsets eng.DangAmbigs eng.freq-dawg eng.inttemp eng.normproto eng.pffmtable eng.user-words eng.word-dawg eng.unicharset + all: all-am + + .SUFFIXES: +diff -r --unified tesseract-1.04/tessdata/Makefile.am tesseract-1.04b/tessdata/Makefile.am +--- tesseract-1.04/tessdata/Makefile.am 2007-05-16 23:20:49.000000000 +0200 ++++ tesseract-1.04b/tessdata/Makefile.am 2007-05-17 19:50:54.000000000 +0200 +@@ -1,2 +1,2 @@ + datadir = @datadir@/tessdata +-data_DATA = confsets eng.DangAmbigs eng.freq-dawg eng.inttemp eng.normproto eng.pffmtable eng.user-words eng.word-dawg ++data_DATA = confsets eng.DangAmbigs eng.freq-dawg eng.inttemp eng.normproto eng.pffmtable eng.user-words eng.word-dawg eng.unicharset +diff -r --unified tesseract-1.04/tessdata/Makefile.in tesseract-1.04b/tessdata/Makefile.in +--- tesseract-1.04/tessdata/Makefile.in 2007-05-17 03:49:28.000000000 +0200 ++++ tesseract-1.04b/tessdata/Makefile.in 2007-05-17 19:51:12.000000000 +0200 +@@ -156,7 +156,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-data_DATA = confsets eng.DangAmbigs eng.freq-dawg eng.inttemp eng.normproto eng.pffmtable eng.user-words eng.word-dawg ++data_DATA = confsets eng.DangAmbigs eng.freq-dawg eng.inttemp eng.normproto eng.pffmtable eng.user-words eng.word-dawg eng.unicharset + all: all-am + + .SUFFIXES: +diff -r --unified tesseract-1.04/tessdata/.svn/entries tesseract-1.04b/tessdata/.svn/entries +--- tesseract-1.04/tessdata/.svn/entries 2007-05-17 02:48:32.000000000 +0200 ++++ tesseract-1.04b/tessdata/.svn/entries 2007-05-17 03:52:29.000000000 +0200 +@@ -50,42 +50,29 @@ + + deleted + +-eng.user-words +-file +-35 +- +- +- +-2007-05-10T18:17:44.000000Z +-d00614591ecf256830b3d8a1263606be +-2007-05-16T01:20:35.283576Z +-35 +-theraysmith +-has-props +- + Makefile.in + file + 62 + + + +-2007-05-17T00:35:58.000000Z ++2007-05-17T01:49:28.000000Z + 68630915623800863ed9e9b865f29b34 + 2007-05-17T00:48:27.838973Z + 62 + theraysmith + +-confsets ++eng.user-words + file ++35 + + + +- +-2007-03-29T16:59:08.000000Z +-d73f2106853e1898333bca784571cda9 +-2007-03-07T20:03:40.465101Z +-2 +-tmbdev ++2007-05-10T18:17:44.000000Z ++d00614591ecf256830b3d8a1263606be ++2007-05-16T01:20:35.283576Z ++35 ++theraysmith + has-props + + netwts +@@ -112,6 +99,19 @@ + + deleted + ++confsets ++file ++ ++ ++ ++ ++2007-03-29T16:59:08.000000Z ++d73f2106853e1898333bca784571cda9 ++2007-03-07T20:03:40.465101Z ++2 ++tmbdev ++has-props ++ + eng.freq-dawg + file + 35 +@@ -128,9 +128,6 @@ + tessconfigs + dir + +-configs +-dir +- + eng.inttemp + file + 35 +@@ -144,6 +141,9 @@ + theraysmith + has-props + ++configs ++dir ++ + soptable.cls + file + 43 +@@ -168,7 +168,7 @@ + + deleted + +-fmtable.cls ++fnetwts + file + 43 + +@@ -192,7 +192,7 @@ + + deleted + +-fnetwts ++fmtable.cls + file + 43 + diff --git a/tesseract.spec b/tesseract.spec new file mode 100644 index 0000000..2c38776 --- /dev/null +++ b/tesseract.spec @@ -0,0 +1,80 @@ +Name: tesseract +Version: 1.04 +Release: 1%{?dist} +Summary: Raw OCR Engine + +Group: Applications/File +License: Apache License +URL: http://code.google.com/p/tesseract-ocr/ +Source0: http://tesseract-ocr.googlecode.com/files/%{name}-%{version}.tar.gz +Patch0: %{name}-1.04-compilefix.patch +Patch1: %{name}-1.04-upstreampatch.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libtiff-devel + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description +A commercial quality OCR engine originally developed at HP between 1985 and +1995. In 1995, this engine was among the top 3 evaluated by UNLV. It was +open-sourced by HP and UNLV in 2005. + +%description devel +The %{name}-devel package contains header file for +developing applications that use %{name}. + +%prep +%setup -q +%patch0 +%patch1 -p1 + +%build +sed -i 's#-DTESSDATA_PREFIX=@datadir@/#-DTESSDATA_PREFIX=@datadir@/%{name}/##' ccutil/Makefile.* +%configure +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_datadir}/tesseract +mv $RPM_BUILD_ROOT%{_datadir}/tessdata $RPM_BUILD_ROOT%{_datadir}/tesseract +rm -rf $RPM_BUILD_ROOT%{_libdir} + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%{_bindir}/%{name} +%{_bindir}/*training +%{_datadir}/%{name} + +%doc AUTHORS ChangeLog COPYING NEWS phototest.tif README + +%files devel +%defattr(-,root,root,-) +%{_includedir}/%{name} + +%changelog +* Thu Mar 22 2007 Karol Trzcionka - 1.04-1 +- Change url and source +- Update to v1.04 +- Make patch bases on upstream's v1.04b +- Change compilefix patch +- Adding -devel subpackage +* Thu Mar 22 2007 Karol Trzcionka - 1.03-2 +- Including patch bases on cvs +* Tue Feb 13 2007 Karol Trzcionka - 1.03-1 +- Update to v1.03 +* Sat Jan 26 2007 Karol Trzcionka - 1.02-3 +- Update BRs +- Fix x86_64 compile +* Sat Dec 30 2006 Karol Trzcionka - 1.02-2 +- Fixed rpmlint warning in SRPM +* Fri Dec 29 2006 Karol Trzcionka - 1.02-1 +- Initial Release \ No newline at end of file