diff --git a/sources b/sources index a4ed30c..7eab371 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (tessdata_fast-4.0.0.tar.gz) = bffb954712c4ae14ba223fb37a4ea5a9a0aa21d735d784a66cbb8d226cf53fed8138132bf9f887d3f740cb7ccb32ab46954ca25e43212872ea172ffe95891a05 SHA512 (tesseract-4.0.0.tar.gz) = 69e57d4ba1fc43d212fd0fff69a2b5d48a3b37cfee7054fdc083cbb7e04d92317609a32e457229661d70ce8d9b16c9d25e81bfc3861db660dd2c8f292202d447 diff --git a/tesseract.spec b/tesseract.spec index f79ca0b..12953cb 100644 --- a/tesseract.spec +++ b/tesseract.spec @@ -1,28 +1,13 @@ -#global commit 87635c1ecb2ddba0fa1484e57680090b8bb7ac87 -#global shortcommit %(c=%{commit}; echo ${c:0:7}) -#global tessdata_commit 7274cfad453d770f36b53ec5a2294ddd6d905703 -#global tessdata_shortcommit %(c=%{tessdata_commit}; echo ${c:0:7}) - #global pre beta.4 -#global tessdata_pre beta.1 Name: tesseract Version: 4.0.0 -Release: 4%{?pre:.%pre}%{?commit:.git%{shortcommit}}%{?dist} +Release: 5%{?pre:.%pre}%{?dist} Summary: Raw OCR Engine License: ASL 2.0 URL: https://github.com/tesseract-ocr/%{name} -%if 0%{?commit:1} -Source0: https://github.com/tesseract-ocr/tesseract/archive/%{commit}/%{name}-%{shortcommit}.tar.gz -%else Source0: https://github.com/tesseract-ocr/tesseract/archive/%{version}%{?pre:-%pre}/%{name}-%{version}%{?pre:-%pre}.tar.gz -%endif -%if 0%{?tessdata_commit:1} -Source1: https://github.com/tesseract-ocr/tessdata_fast/archive/%{tessdata_commit}/tessdata_fast-%{tessdata_shortcommit}.tar.gz -%else -Source1: https://github.com/tesseract-ocr/tessdata_fast/archive/%{version}%{?tessdata_pre:-%tessdata_pre}/tessdata_fast-%{version}%{?tessdata_pre:-%tessdata_pre}.tar.gz -%endif # Tweak location of tessdata folder Patch0: tesseract_datadir.patch @@ -37,8 +22,6 @@ BuildRequires: cairo-devel BuildRequires: libicu-devel BuildRequires: pango-devel -# TODO Obsolete langpacks not provided anymore - %description A commercial quality OCR engine originally developed at HP between 1985 and @@ -55,15 +38,6 @@ The %{name}-devel package contains header file for developing applications that use %{name}. -%package osd -Summary: Orientation & Script Detection Data for %{name} -BuildArch: noarch -Requires: %{name} = %{version}-%{release} - -%description osd -Orientation & Script Detection Data for %{name} - - %package tools Summary: Training tools for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -72,220 +46,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The %{name}-tools package contains tools for training %{name}. -# define lang_subpkg macro -# m: 3 letter macrolanguage code -# l: langcode used in Provides and Supplements tags -# n: language name -# -m and -n is needed for subpackages, -l is optional -# -%define lang_subpkg(l:m:n:) \ -%define macrolang %{-m:%{-m*}}%{!-m:%{error:3 letter Language code not defined}} \ -%define langcode %{-l:%{-l*}}%{!-l:%{error:Language code not defined}} \ -%define langname %{-n:%{-n*}}%{!-n:%{error:Language name not defined}} \ -\ -%package langpack-%{macrolang}\ -Summary: %{langname} language data for %{name}\ -BuildArch: noarch\ -Requires: %{name} = %{version}-%{release}\ -%{-l:Provides: %{name}-langpack-%{langcode} = %{version}-%{release}\ -Supplements: (%{name} = %{version}-%{release} and langpacks-%{langcode})}\ -\ -%description langpack-%{macrolang}\ -%{langname} language data for %{name}.\ -\ -%files langpack-%{macrolang}\ -%{_datadir}/%{name}/tessdata/%{macrolang}.* - -# define script_subpkg macro -# s: script name -# n: package name -# -%define script_subpkg(s:n:) \ -%define scriptname %{-s:%{-s*}}%{!-s:%{error:Script name defined}} \ -%define filename %{-n:%{-n*}}%{!-n:%{error:Package name not defined}} \ -%define pkgname %(echo %filename | tr '[:upper:]' '[:lower:]') \ -\ -%package script-%{pkgname}\ -Summary: %{scriptname} script data for %{name}\ -BuildArch: noarch\ -Requires: %{name} = %{version}-%{release}\ -\ -%description script-%{pkgname}\ -%{scriptname} script data for %{name}.\ -\ -%files script-%{pkgname}\ -%{_datadir}/%{name}/tessdata/script/%{filename}.* - -# see https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes -# and https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes -%lang_subpkg -m afr -l af -n Afrikaans -%lang_subpkg -m amh -l an -n Amharic -%lang_subpkg -m ara -l ar -n Arabic -%lang_subpkg -m asm -l as -n Assamese -%lang_subpkg -m aze -l az -n Azerbaijani -%lang_subpkg -m aze_cyrl -n %{quote:Azerbaijani (Cyrilic)} -%lang_subpkg -m bel -l bel -n Belarusian -%lang_subpkg -m ben -l bn -n Bengali -%lang_subpkg -m bod -l bo -n %{quote:Tibetan (Standard)} -%lang_subpkg -m bos -l bs -n Bosnian -%lang_subpkg -m bre -l br -n Breton -%lang_subpkg -m bul -l bg -n Bulgarian -%lang_subpkg -m cat -l ca -n Catalan -%lang_subpkg -m ceb -n Cebuano -%lang_subpkg -m ces -l cs -n Czech -%lang_subpkg -m chi_sim -l zh_CN -n %{quote:Chinese (Simplified)} -%lang_subpkg -m chi_sim_vert -l zh_CN -n %{quote:Chinese (Simplified, Vertical)} -%lang_subpkg -m chi_tra -l zh_TW -n %{quote:Chinese (Traditional)} -%lang_subpkg -m chi_tra_vert -l zh_TW -n %{quote:Chinese (Traditional, Vertical)} -%lang_subpkg -m chr -n Cherokee -%lang_subpkg -m cos -l co -n Corsican -%lang_subpkg -m cym -l cy -n Welsh -%lang_subpkg -m dan -l da -n Danish -%lang_subpkg -m deu -l de -n German -%lang_subpkg -m div -l dv -n %{quote:Dhivehi; Maldivian} -%lang_subpkg -m dzo -n Dzongkha -%lang_subpkg -m ell -l el -n Greek -%lang_subpkg -m enm -n %{quote:Middle English (1100-1500)} -%lang_subpkg -m epo -l eo -n Esperanto -%lang_subpkg -m est -l et -n Estonian -%lang_subpkg -m eus -l eu -n Basque -%lang_subpkg -m fao -l fo -n %{quote:Faroese} -%lang_subpkg -m fas -l fa -n %{quote:Persian (Farsi)} -%lang_subpkg -m fil -n %{quote:Filipino; Pilipino} -%lang_subpkg -m fin -l fi -n Finnish -%lang_subpkg -m fra -l fr -n French -%lang_subpkg -m frk -n Fraktur -%lang_subpkg -m frm -n %{quote:Middle French (ca. 1400-1600)} -%lang_subpkg -m fry -l fy -n %{quote:Western Frisian} -%lang_subpkg -m gla -l gd -n %{quote:Gaelic; Scottish Gaelic} -%lang_subpkg -m gle -l ga -n Irish -%lang_subpkg -m glg -l gl -n Galician -%lang_subpkg -m grc -n %{quote:Ancient Greek} -%lang_subpkg -m guj -l gu -n Gujarati -%lang_subpkg -m hat -l ht -n Haitian -%lang_subpkg -m heb -l he -n Hebrew -%lang_subpkg -m hin -l hi -n Hindi -%lang_subpkg -m hrv -l hr -n Croatian -%lang_subpkg -m hun -l hu -n Hungarian -%lang_subpkg -m hye -l hy -n Armenian -%lang_subpkg -m iku -l iu -n Inuktitut -%lang_subpkg -m ind -l id -n Indonesian -%lang_subpkg -m isl -l is -n Icelandic -%lang_subpkg -m ita -l it -n Italian -%lang_subpkg -m ita_old -n %{quote:Italian (Old)} -%lang_subpkg -m jav -l jav -n Javanese -%lang_subpkg -m jpn -l ja -n Japanese -%lang_subpkg -m jpn_vert -l ja -n "Japanese (Vertical)" -%lang_subpkg -m kan -l kn -n Kannada -%lang_subpkg -m kat -l ka -n Georgian -%lang_subpkg -m kat_old -n %{quote:Georgian (Old)} -%lang_subpkg -m kaz -l kk -n Kazakh -%lang_subpkg -m khm -l km -n Khmer -%lang_subpkg -m kir -l ky -n Kyrgyz -%lang_subpkg -m kor -l ko -n Korean -%lang_subpkg -m kor_vert -l ko -n "Korean (Vertical)" -%lang_subpkg -m kmr -l ku -n Kurmanji -%lang_subpkg -m lao -l lo -n Lao -%lang_subpkg -m lat -l lat -n Latin -%lang_subpkg -m lav -l lv -n Latvian -%lang_subpkg -m lit -l lt -n Lithuanian -%lang_subpkg -m ltz -l lb -n Luxembourgish -%lang_subpkg -m mal -l ml -n Malayalam -%lang_subpkg -m mar -l mr -n Marathi -%lang_subpkg -m mkd -l mk -n Macedonian -%lang_subpkg -m mlt -l mt -n Maltese -%lang_subpkg -m mon -l mn -n Mongolian -%lang_subpkg -m mri -l mi -n Maori -%lang_subpkg -m msa -l ms -n Malay -%lang_subpkg -m mya -l my -n Burmese -%lang_subpkg -m nep -l ne -n Nepali -%lang_subpkg -m nld -l nl -n Dutch -%lang_subpkg -m nor -l no -n Norwegian -%lang_subpkg -m oci -l oc -n Occitan -%lang_subpkg -m ori -l or -n Oriya -%lang_subpkg -m pan -l pa -n Panjabi -%lang_subpkg -m pol -l pl -n Polish -%lang_subpkg -m por -l pt -n Portuguese -%lang_subpkg -m pus -l ps -n Pashto -%lang_subpkg -m que -l qu -n Quechuan -%lang_subpkg -m ron -l ro -n Romanian -%lang_subpkg -m rus -l ru -n Russian -%lang_subpkg -m san -l sa -n Sanskrit -%lang_subpkg -m sin -l si -n Sinhala -%lang_subpkg -m slk -l sk -n Slovakian -%lang_subpkg -m slv -l sl -n Slovenian -%lang_subpkg -m snd -l sd -n Sindhi -%lang_subpkg -m spa -l es -n Spanish -%lang_subpkg -m spa_old -n %{quote:Spanish (Old)} -%lang_subpkg -m sqi -l sq -n Albanian -%lang_subpkg -m srp -l sr -n Serbian -%lang_subpkg -m srp_latn -n %{quote:Serbian (Latin)} -%lang_subpkg -m sun -l su -n Sundanese -%lang_subpkg -m swa -l sw -n Swahili -%lang_subpkg -m swe -l sv -n Swedish -%lang_subpkg -m syr -l ar_SY -n Syriac -%lang_subpkg -m tam -l ta -n Tamil -%lang_subpkg -m tat -l tt -n Tatar -%lang_subpkg -m tel -l te -n Telugu -%lang_subpkg -m tgk -l tg -n Tajik -%lang_subpkg -m tha -l th -n Thai -%lang_subpkg -m tir -l ti -n Tigrinya -%lang_subpkg -m ton -l to -n Tongan -%lang_subpkg -m tur -l tr -n Turkish -%lang_subpkg -m uig -l ug -n Uyghur -%lang_subpkg -m ukr -l uk -n Ukrainian -%lang_subpkg -m urd -l ur -n Urdu -%lang_subpkg -m uzb -l uz -n Uzbek -%lang_subpkg -m uzb_cyrl -n %{quote:Uzbek (Cyrillic)} -%lang_subpkg -m vie -l vi -n Vietnamese -%lang_subpkg -m yid -l yi -n Yiddish -%lang_subpkg -m yor -l yo -n Yoruba - -%script_subpkg -n Arabic -s Arabic -%script_subpkg -n Armenian -s Armenian -%script_subpkg -n Bengali -s Bengali -%script_subpkg -n Canadian_Aboriginal -s "Canadian (Aboriginal)" -%script_subpkg -n Cherokee -s Cherokee -%script_subpkg -n Cyrillic -s Cyrillic -%script_subpkg -n Devanagari -s Devanagari -%script_subpkg -n Ethiopic -s Ethiopic -%script_subpkg -n Fraktur -s Fraktur -%script_subpkg -n Georgian -s Georgian -%script_subpkg -n Greek -s Greek -%script_subpkg -n Gujarati -s Gujarati -%script_subpkg -n Gurmukhi -s Gurmukhi -%script_subpkg -n HanS -s "Han (Simplified)" -%script_subpkg -n HanS_vert -s "Han (Simplified, Vertical)" -%script_subpkg -n HanT -s "Han (Traditional)" -%script_subpkg -n HanT_vert -s "Han (Traditional, Vertical)" -%script_subpkg -n Hangul -s Hangul -%script_subpkg -n Hangul_vert -s "Hangul (Vertical)" -%script_subpkg -n Hebrew -s Hebrew -%script_subpkg -n Japanese -s Japanese -%script_subpkg -n Japanese_vert -s "Japanese (Vertical)" -%script_subpkg -n Kannada -s Kannada -%script_subpkg -n Khmer -s Khmer -%script_subpkg -n Lao -s Lao -%script_subpkg -n Latin -s Latin -%script_subpkg -n Malayalam -s Malayalam -%script_subpkg -n Myanmar -s Myanmar -%script_subpkg -n Oriya -s Oriya -%script_subpkg -n Sinhala -s Sinhala -%script_subpkg -n Syriac -s Syriac -%script_subpkg -n Tamil -s Tamil -%script_subpkg -n Telugu -s Telugu -%script_subpkg -n Thaana -s Thaana -%script_subpkg -n Thai -s Thai -%script_subpkg -n Tibetan -s Tibetan -%script_subpkg -n Vietnamese -s Vietnamese - - %prep -%if 0%{?commit:1} -%autosetup -p1 -n %{name}-%{commit} -a1 -%else -%autosetup -p1 -n %{name}-%{version}%{?pre:-%pre} -a1 -%endif +%autosetup -p1 -n %{name}-%{version}%{?pre:-%pre} %build @@ -302,23 +64,8 @@ autoreconf -ifv find %{buildroot}%{_libdir} -type f -name '*.la' -delete +# Create directory for tessdata mkdir -p %{buildroot}/%{_datadir}/%{name}/tessdata/ -%if 0%{?tessdata_commit:1} -cp -a tessdata_fast-%{tessdata_commit}/* %{buildroot}/%{_datadir}/%{name}/tessdata/ -%else -cp -a tessdata_fast-%{version}%{?tessdata_pre:-%tessdata_pre}/* %{buildroot}/%{_datadir}/%{name}/tessdata/ -%endif - -# Tessdata license is same as the tesseract license, delete the tessdata COPYING file -rm -f %{buildroot}/%{_datadir}/%{name}/tessdata/COPYING - -# Remove tessdata README.md from buildroot, rename source for %%doc to avoid conflict with tesseract README.md -rm -f %{buildroot}/%{_datadir}/%{name}/tessdata/README.md -%if 0%{?tessdata_commit:1} -mv tessdata_fast-%{tessdata_commit}/README.md README_tessdata.md -%else -mv tessdata_fast-%{version}%{?tessdata_pre:-%tessdata_pre}/README.md README_tessdata.md -%endif @@ -326,14 +73,13 @@ mv tessdata_fast-%{version}%{?tessdata_pre:-%tessdata_pre}/README.md README_tess %files -%license COPYING +%license LICENSE %doc AUTHORS ChangeLog README.md README_tessdata.md %{_bindir}/%{name} %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/tessdata %{_datadir}/%{name}/tessdata/configs/ %{_datadir}/%{name}/tessdata/tessconfigs/ -%{_datadir}/%{name}/tessdata/eng.* %{_datadir}/%{name}/tessdata/pdf.ttf %{_libdir}/lib%{name}*.so.4* @@ -342,9 +88,6 @@ mv tessdata_fast-%{version}%{?tessdata_pre:-%tessdata_pre}/README.md README_tess %{_libdir}/lib%{name}*.so %{_libdir}/pkgconfig/%{name}.pc -%files osd -%{_datadir}/%{name}/tessdata/osd.traineddata - %files tools %{_bindir}/ambiguous_words %{_bindir}/classifier_tester @@ -367,6 +110,9 @@ mv tessdata_fast-%{version}%{?tessdata_pre:-%tessdata_pre}/README.md README_tess %changelog +* Mon Jul 22 2019 Sandro Mani - 4.0.0-5 +- Drop langpack and script subpackages, moved to separate tesseract-tessdata package + * Mon Jul 01 2019 Sandro Mani - 4.0.0-4 - Fix -frk subpackage description (#1721228)