diff --git a/4.0.0.tar.gz b/4.0.0.tar.gz deleted file mode 100644 index 45e688a4c62c50d34005778b11dfc3d7ce93f80a..0000000000000000000000000000000000000000 Binary files a/4.0.0.tar.gz and /dev/null differ diff --git a/tesseract-5.1.0.tar.gz b/tesseract-5.1.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..0436c0ebb31933b5db920bf6e560b33edaf9e7de Binary files /dev/null and b/tesseract-5.1.0.tar.gz differ diff --git a/tesseract.spec b/tesseract.spec index 65337c2b1bd9c4de9d0d8d6d3c719103f69f7a9b..475afa100fcb38f016185743160610409cab49ed 100644 --- a/tesseract.spec +++ b/tesseract.spec @@ -1,11 +1,11 @@ Name: tesseract -Version: 4.0.0 +Version: 5.1.0 Release: 1 Summary: Raw OCR Engine License: Apache 2.0 and BSD-2-Clause URL: https://github.com/tesseract-ocr/%{name} -Source0: https://github.com/tesseract-ocr/tesseract/archive/%{version}.tar.gz -Patch0: tesseract_datadir.patch +Source0: https://github.com/tesseract-ocr/tesseract/archive/%{name}-%{version}.tar.gz +Patch0: tesseract_cmake.patch BuildRequires: automake autoconf-archive gcc-c++ libtool libtiff-devel leptonica-devel BuildRequires: cairo-devel libicu-devel pango-devel BuildRequires: tesseract-langpack-eng @@ -49,12 +49,9 @@ mkdir -p %{buildroot}/%{_datadir}/%{name}/tessdata/ %license LICENSE %doc AUTHORS ChangeLog README.md %{_bindir}/%{name} -%dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/tessdata -%{_datadir}/%{name}/tessdata/configs/ -%{_datadir}/%{name}/tessdata/tessconfigs/ -%{_datadir}/%{name}/tessdata/pdf.ttf -%{_libdir}/lib%{name}*.so.4* +%{_datadir}/%{name}/ +%{_libdir}/lib%{name}.so* +%{_datadir}/tessdata/ %files devel %{_includedir}/%{name} @@ -68,19 +65,19 @@ mkdir -p %{buildroot}/%{_datadir}/%{name}/tessdata/ %{_bindir}/combine_lang_model %{_bindir}/combine_tessdata %{_bindir}/dawg2wordlist -%{_bindir}/language-specific.sh %{_bindir}/lstmeval %{_bindir}/lstmtraining %{_bindir}/merge_unicharsets %{_bindir}/mftraining %{_bindir}/set_unicharset_properties %{_bindir}/shapeclustering -%{_bindir}/tesstrain.sh -%{_bindir}/tesstrain_utils.sh %{_bindir}/text2image %{_bindir}/unicharset_extractor %{_bindir}/wordlist2dawg %changelog +* Thu Jul 28 2022 fushanqing - 5.1.0-1 +- update to 5.1.0 + * Fri Jan 8 2021 chengzihan - 4.0.0-1 - Package init diff --git a/tesseract_cmake.patch b/tesseract_cmake.patch new file mode 100644 index 0000000000000000000000000000000000000000..1ba8472d13c44ecd5dc0f37e01691a977af3aefc --- /dev/null +++ b/tesseract_cmake.patch @@ -0,0 +1,70 @@ +diff -rupN --no-dereference tesseract-5.1.0/CMakeLists.txt tesseract-5.1.0-new/CMakeLists.txt +--- tesseract-5.1.0/CMakeLists.txt 2022-03-01 17:25:45.000000000 +0100 ++++ tesseract-5.1.0-new/CMakeLists.txt 2022-03-02 15:47:55.575671906 +0100 +@@ -328,7 +328,7 @@ elseif(UNIX) + set(LIB_pthread pthread) + endif() + elseif(WIN32) +- set(LIB_Ws2_32 Ws2_32) ++ set(LIB_Ws2_32 ws2_32) + endif() + + add_definitions("-DCMAKE_BUILD") +@@ -770,11 +770,14 @@ set_target_properties(libtesseract + set_target_properties(libtesseract + PROPERTIES SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) + +-if(WIN32) ++if(MSVC) + set_target_properties(libtesseract + PROPERTIES OUTPUT_NAME tesseract${VERSION_MAJOR}${VERSION_MINOR}) + set_target_properties(libtesseract + PROPERTIES DEBUG_OUTPUT_NAME tesseract${VERSION_MAJOR}${VERSION_MINOR}d) ++elseif(MINGW) ++ set_target_properties(libtesseract PROPERTIES SUFFIX "-${VERSION_MAJOR}${VERSION_MINOR}${CMAKE_SHARED_LIBRARY_SUFFIX}") ++ set_target_properties(libtesseract PROPERTIES OUTPUT_NAME tesseract) + else() + set_target_properties(libtesseract PROPERTIES OUTPUT_NAME tesseract) + endif() +@@ -882,9 +885,9 @@ install( + + if(INSTALL_CONFIGS) + install(FILES ${TESSERACT_CONFIGS} +- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/tessdata/configs) ++ DESTINATION ${TESSDATA_PREFIX}/tessdata/configs) + install(FILES ${TESSERACT_TESSCONFIGS} +- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/tessdata/tessconfigs) ++ DESTINATION ${TESSDATA_PREFIX}/tessdata/tessconfigs) + endif() + + # ############################################################################## +diff -rupN tesseract-5.1.0/src/training/CMakeLists.txt tesseract-5.1.0-new/src/training/CMakeLists.txt +--- tesseract-5.1.0/src/training/CMakeLists.txt 2022-03-01 17:25:45.000000000 +0100 ++++ tesseract-5.1.0-new/src/training/CMakeLists.txt 2022-03-11 11:14:25.962728696 +0100 +@@ -108,7 +108,7 @@ if(NOT DISABLED_LEGACY_ENGINE) + common/trainingsampleset.h) + endif() + +-add_library(common_training ${COMMON_TRAINING_SRC}) ++add_library(common_training STATIC ${COMMON_TRAINING_SRC}) + target_include_directories(common_training PUBLIC common + ${CMAKE_CURRENT_BINARY_DIR}) + target_link_libraries(common_training PUBLIC libtesseract) +@@ -242,7 +242,7 @@ if(ICU_FOUND) + + file(GLOB unicharset_training_src unicharset/*) + +- add_library(unicharset_training ${unicharset_training_src}) ++ add_library(unicharset_training STATIC ${unicharset_training_src}) + if(SW_BUILD) + target_link_libraries(unicharset_training + PUBLIC common_training org.sw.demo.unicode.icu.i18n) +@@ -361,7 +361,7 @@ if(ICU_FOUND) + + file(GLOB pango_training_src pango/*) + +- add_library(pango_training ${pango_training_src}) ++ add_library(pango_training STATIC ${pango_training_src}) + target_link_libraries(pango_training PUBLIC unicharset_training) + if(SW_BUILD) + target_link_libraries(pango_training diff --git a/tesseract_datadir.patch b/tesseract_datadir.patch deleted file mode 100644 index c98e3a49792f3e7b6e83cd1c89f51104d1a28868..0000000000000000000000000000000000000000 --- a/tesseract_datadir.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -rupN tesseract-4.0.0/src/ccutil/Makefile.am tesseract-4.0.0-new/src/ccutil/Makefile.am ---- tesseract-4.0.0/src/ccutil/Makefile.am 2018-10-29 09:53:12.000000000 +0100 -+++ tesseract-4.0.0-new/src/ccutil/Makefile.am 2018-11-13 15:23:08.331318335 +0100 -@@ -3,7 +3,7 @@ AM_CXXFLAGS = - AM_CPPFLAGS = - - if !NO_TESSDATA_PREFIX --AM_CXXFLAGS += -DTESSDATA_PREFIX=@datadir@ -+AM_CXXFLAGS += -DTESSDATA_PREFIX=@datadir@/tesseract/ - endif - - if VISIBILITY -diff -rupN tesseract-4.0.0/src/lstm/Makefile.am tesseract-4.0.0-new/src/lstm/Makefile.am ---- tesseract-4.0.0/src/lstm/Makefile.am 2018-10-29 09:53:12.000000000 +0100 -+++ tesseract-4.0.0-new/src/lstm/Makefile.am 2018-11-13 15:23:08.332317564 +0100 -@@ -12,7 +12,7 @@ SUBDIRS = - AM_CXXFLAGS = $(OPENMP_CXXFLAGS) - - if !NO_TESSDATA_PREFIX --AM_CXXFLAGS += -DTESSDATA_PREFIX=@datadir@ -+AM_CXXFLAGS += -DTESSDATA_PREFIX=@datadir@/tesseract/ - endif - - if VISIBILITY -diff -rupN tesseract-4.0.0/tessdata/configs/Makefile.am tesseract-4.0.0-new/tessdata/configs/Makefile.am ---- tesseract-4.0.0/tessdata/configs/Makefile.am 2018-10-29 09:53:12.000000000 +0100 -+++ tesseract-4.0.0-new/tessdata/configs/Makefile.am 2018-11-13 15:23:08.332317564 +0100 -@@ -1,3 +1,3 @@ --datadir = @datadir@/tessdata/configs -+datadir = @datadir@/tesseract/tessdata/configs - data_DATA = inter makebox box.train unlv ambigs.train lstm.train lstmdebug api_config kannada box.train.stderr quiet logfile digits hocr tsv linebox pdf rebox strokewidth bigram txt - EXTRA_DIST = inter makebox box.train unlv ambigs.train lstm.train lstmdebug api_config kannada box.train.stderr quiet logfile digits hocr tsv linebox pdf rebox strokewidth bigram txt -diff -rupN tesseract-4.0.0/tessdata/Makefile.am tesseract-4.0.0-new/tessdata/Makefile.am ---- tesseract-4.0.0/tessdata/Makefile.am 2018-10-29 09:53:12.000000000 +0100 -+++ tesseract-4.0.0-new/tessdata/Makefile.am 2018-11-13 15:23:08.332317564 +0100 -@@ -1,4 +1,4 @@ --datadir = @datadir@/tessdata -+datadir = @datadir@/tesseract/tessdata - - data_DATA = pdf.ttf - EXTRA_DIST = $(data_DATA) -diff -rupN tesseract-4.0.0/tessdata/tessconfigs/Makefile.am tesseract-4.0.0-new/tessdata/tessconfigs/Makefile.am ---- tesseract-4.0.0/tessdata/tessconfigs/Makefile.am 2018-10-29 09:53:12.000000000 +0100 -+++ tesseract-4.0.0-new/tessdata/tessconfigs/Makefile.am 2018-11-13 15:23:08.332317564 +0100 -@@ -1,3 +1,3 @@ --datadir = @datadir@/tessdata/tessconfigs -+datadir = @datadir@/tesseract/tessdata/tessconfigs - data_DATA = batch batch.nochop nobatch matdemo segdemo msdemo - EXTRA_DIST = batch batch.nochop nobatch matdemo segdemo msdemo