rpms/tesseract/devel tesseract-1.04-compilefix.patch, NONE, 1.1 tesseract-1.04-upstreampatch.patch, NONE, 1.1 tesseract.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Karol Trzcionka (karlik) fedora-extras-commits at redhat.com
Sat Jun 16 13:51:25 UTC 2007


Author: karlik

Update of /cvs/pkgs/rpms/tesseract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27407/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tesseract-1.04-compilefix.patch 
	tesseract-1.04-upstreampatch.patch tesseract.spec 
Log Message:
release tesseract 1.04-1


tesseract-1.04-compilefix.patch:

--- NEW FILE tesseract-1.04-compilefix.patch ---
--- ./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;
 /*

tesseract-1.04-upstreampatch.patch:

--- NEW FILE tesseract-1.04-upstreampatch.patch ---
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
 


--- NEW FILE tesseract.spec ---
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 <karlikt at gmail.com> - 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 <karlikt at gmail.com> - 1.03-2
- Including patch bases on cvs
* Tue Feb 13 2007 Karol Trzcionka <karlikt at gmail.com> - 1.03-1
- Update to v1.03
* Sat Jan 26 2007 Karol Trzcionka <karlikt at gmail.com> - 1.02-3
- Update BRs
- Fix x86_64 compile
* Sat Dec 30 2006 Karol Trzcionka <karlikt at gmail.com> - 1.02-2
- Fixed rpmlint warning in SRPM
* Fri Dec 29 2006 Karol Trzcionka <karlikt at gmail.com> - 1.02-1
- Initial Release

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jun 2007 03:33:03 -0000	1.1
+++ .cvsignore	16 Jun 2007 13:50:50 -0000	1.2
@@ -0,0 +1 @@
+tesseract-1.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tesseract/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jun 2007 03:33:03 -0000	1.1
+++ sources	16 Jun 2007 13:50:50 -0000	1.2
@@ -0,0 +1 @@
+c39bd7b465c37a3863140e88d51cd839  tesseract-1.04.tar.gz




More information about the fedora-extras-commits mailing list