diff --git a/.gitignore b/.gitignore index 6115873..31a4eb6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ tesseract-2.00.eng.tar.gz /tesseract-ocr-3.01.eng.tar.gz /tesseract-ocr-3.02.02.tar.gz /tesseract-ocr-3.02.eng.tar.gz +/tesseract-ocr-3.01.osd.tar.gz diff --git a/sources b/sources index 905fcff..22c49be 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 26adc8154f0e815053816825dde246e6 tesseract-ocr-3.02.02.tar.gz 3562250fe6f4e76229a329166b8ae853 tesseract-ocr-3.02.eng.tar.gz +683486e01f5b87c17f2f5815f770ccb3 tesseract-ocr-3.01.osd.tar.gz diff --git a/tesseract-3.02.02-format.patch b/tesseract-3.02.02-format.patch new file mode 100644 index 0000000..45a4136 --- /dev/null +++ b/tesseract-3.02.02-format.patch @@ -0,0 +1,12 @@ +diff -up ./dict/permdawg.cpp.format ./dict/permdawg.cpp +--- ./dict/permdawg.cpp.format 2012-09-02 22:08:43.000000000 +0200 ++++ ./dict/permdawg.cpp 2014-03-27 18:38:40.026525432 +0100 +@@ -205,7 +205,7 @@ void Dict::go_deeper_dawg_fxn( + STRING word_str; + word->string_and_lengths(&word_str, NULL); + word_str += " "; +- fprintf(output_ambig_words_file_, word_str.string()); ++ fprintf(output_ambig_words_file_, "%s", word_str.string()); + } + WERD_CHOICE *adjusted_word = word; + WERD_CHOICE hyphen_tail_word(&getUnicharset()); diff --git a/tesseract.spec b/tesseract.spec index 177b004..bb5812e 100644 --- a/tesseract.spec +++ b/tesseract.spec @@ -1,7 +1,7 @@ %global fullname tesseract-ocr Name: tesseract Version: 3.02.02 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Raw OCR Engine Group: Applications/File @@ -9,8 +9,9 @@ License: ASL 2.0 URL: http://code.google.com/p/%{fullname}/ Source0: http://tesseract-ocr.googlecode.com/files/%{fullname}-%{version}.tar.gz Source1: http://tesseract-ocr.googlecode.com/files/%{fullname}-3.02.eng.tar.gz +Source2: http://tesseract-ocr.googlecode.com/files/%{fullname}-3.01.osd.tar.gz Patch0: %{name}-pkgconfig.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: %{name}-%{version}-format.patch BuildRequires: libtiff-devel BuildRequires: leptonica-devel BuildRequires: automake,libtool @@ -21,6 +22,11 @@ Summary: Development files for %{fullname} Group: Development/Libraries Requires: %{name} = %{version}-%{release} +%package osd +Summary: Orientation & Script Detection Data for %{fullname} +Group: Applications/File +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 @@ -30,10 +36,15 @@ open-sourced by HP and UNLV in 2005. The %{name}-devel package contains header file for developing applications that use %{name}. +%description osd +Orientation & Script Detection Data for %{fullname} + %prep %setup -q -n %{fullname} -%setup -q -a 1 -n %{fullname} +%setup -q -a 1 -D -n %{fullname} +%setup -q -a 2 -D -n %{fullname} %patch0 -p1 +%patch1 -p1 %build sed -i 's#-DTESSDATA_PREFIX=@datadir@/#-DTESSDATA_PREFIX=@datadir@/%{name}/##' ccutil/Makefile.* @@ -66,7 +77,11 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/%{name} %{_bindir}/unicharset_extractor %{_bindir}/wordlist2dawg -%{_datadir}/%{name} +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/tessdata +%{_datadir}/%{name}/tessdata/configs +%{_datadir}/%{name}/tessdata/tessconfigs +%{_datadir}/%{name}/tessdata/eng.* %{_libdir}/lib%{name}*.so.* %{_mandir}/man1/* %{_mandir}/man5/* @@ -78,7 +93,15 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lib%{name}*.so %{_libdir}/pkgconfig/%{name}.pc +%files osd +%{_datadir}/%{name}/tessdata/osd.traineddata + %changelog +* Thu Mar 27 2014 Karol Trzcionka - 3.02.02-3 +- Fix rhbz#1037350 (-Werror=format-security) +- Add OSD data +- Remove BuildRoot tag + * Sun Aug 04 2013 Fedora Release Engineering - 3.02.02-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild