diff --git a/.gitignore b/.gitignore index 85c5c8f..8ea52ca 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /ocrmypdf-9.8.0.tar.gz /ocrmypdf-9.8.1.tar.gz /ocrmypdf-9.8.2.tar.gz +/ocrmypdf-10.2.0.tar.gz diff --git a/0001-Reduce-some-requirements.patch b/0001-Reduce-some-requirements.patch deleted file mode 100644 index 90ad9ee..0000000 --- a/0001-Reduce-some-requirements.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b8d7c9a893620e453590efc152d620c92b58b7b1 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Wed, 15 May 2019 00:15:49 -0400 -Subject: [PATCH] Reduce some requirements. - -Signed-off-by: Elliott Sales de Andrade ---- - setup.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 419a0c9..430a826 100644 ---- a/setup.py -+++ b/setup.py -@@ -95,7 +95,6 @@ setup( - use_scm_version={'version_scheme': 'post-release'}, - cffi_modules=['src/ocrmypdf/lib/compile_leptonica.py:ffibuilder'], - install_requires=[ -- 'chardet >= 3.0.4, < 4', # unlisted requirement of pdfminer.six 20181108 - 'cffi >= 1.9.1', # must be a setup and install requirement - 'img2pdf >= 0.3.0, < 0.4', # pure Python, so track HEAD closely - 'pdfminer.six >= 20181108, <= 20200517', --- -2.25.4 - diff --git a/ocrmypdf.spec b/ocrmypdf.spec index 20b10e9..55c01c2 100644 --- a/ocrmypdf.spec +++ b/ocrmypdf.spec @@ -1,7 +1,7 @@ %global srcname ocrmypdf Name: %{srcname} -Version: 9.8.2 +Version: 10.2.0 Release: 1%{?dist} Summary: Add an OCR text layer to scanned PDF files @@ -9,8 +9,6 @@ Summary: Add an OCR text layer to scanned PDF files License: GPLv3 and CC-BY-SA and Public Domain URL: https://github.com/jbarlow83/OCRmyPDF Source0: %{pypi_source} -# Because we have older versions. -Patch0001: 0001-Reduce-some-requirements.patch BuildArch: noarch @@ -23,20 +21,19 @@ BuildRequires: tesseract-langpack-deu #BuildRequires: unpaper >= 6.1 BuildRequires: python3-devel BuildRequires: python3dist(cffi) >= 1.9.1 +BuildRequires: python3dist(coloredlogs) >= 14 BuildRequires: (python3dist(img2pdf) >= 0.3 with python3dist(img2pdf) < 0.4) -BuildRequires: (python3dist(pdfminer.six) >= 20181108 with python3dist(pdfminer.six) <= 20200124) -BuildRequires: (python3dist(pikepdf) >= 1.8.1 with python3dist(pikepdf) < 2) -BuildRequires: python3dist(pillow) >= 4 -BuildConflicts: python3dist(pillow) = 5.1 -BuildRequires: python3dist(pypdf2) >= 1.26 -BuildRequires: python3dist(pytest) >= 3.9.3 -BuildRequires: python3dist(pytest-cov) >= 2.6 +BuildRequires: (python3dist(pdfminer.six) >= 20191110 with python3dist(pdfminer.six) <= 20200517) +BuildRequires: (python3dist(pikepdf) >= 1.14 with python3dist(pikepdf) < 2) +BuildRequires: python3dist(pillow) >= 7 +BuildRequires: python3dist(pluggy) >= 0.13 +BuildRequires: python3dist(pytest) >= 5 BuildRequires: python3dist(pytest-helpers-namespace) >= 2019.1.8 BuildRequires: python3dist(pytest-runner) -BuildRequires: python3dist(pytest-xdist) >= 1.27 -BuildRequires: python3dist(python-xmp-toolkit) +BuildRequires: python3dist(pytest-xdist) >= 1.31 +BuildRequires: python3dist(python-xmp-toolkit) >= 2.0.1 BuildRequires: python3dist(reportlab) >= 3.3 -BuildRequires: python3dist(setuptools) +BuildRequires: python3dist(setuptools) >= 30.3 BuildRequires: python3dist(setuptools-scm) BuildRequires: python3dist(setuptools-scm-git-archive) BuildRequires: python3dist(sphinx) @@ -71,6 +68,7 @@ rm -rf src/%{srcname}.egg-info # We don't build docs against the installed version, so force the version. sed -i -e "s/release = get_distribution('ocrmypdf').version/release = '%{version}'/g" docs/conf.py +sed -i -e "s/__version__ = .\+/__version__ = '%{version}'/" src/ocrmypdf/_version.py # Cleanup shebang and executable bits. for f in src/%{srcname}/*.py src/%{srcname}/*/*.py; do @@ -99,10 +97,7 @@ install -Dpm 0644 misc/completion/ocrmypdf.fish %{buildroot}%{_datadir}/fish/ven %check -PATH=%{buildroot}%{_bindir}:$PATH \ -PYTHONDONTWRITEBYTECODE=1 \ -PYTHONPATH=%{buildroot}%{python3_sitelib} \ - %{__python3} -m pytest -ra -n auto +%{pytest} -ra -n auto %files -n %{srcname} @@ -110,7 +105,7 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} \ %license LICENSE %{_bindir}/ocrmypdf %{python3_sitelib}/%{srcname} -%{python3_sitelib}/%{srcname}-%{version}-py*.egg-info +%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info %{_datadir}/bash-completion/completions/ocrmypdf %dir %{_datadir}/fish %dir %{_datadir}/fish/vendor_completions.d @@ -122,6 +117,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} \ %changelog +* Mon Jul 13 2020 Elliott Sales de Andrade - 10.2.0-1 +- Update to latest version + * Sun Jun 21 2020 Elliott Sales de Andrade - 9.8.2-1 - Update to latest version diff --git a/sources b/sources index 08f854e..5473b61 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ocrmypdf-9.8.2.tar.gz) = 8635941d105d7023626215450af9441a8a599def8d4b77137aa1a262c960187b1654d233c5138315d74c39f8a16c88865634a1f20a10cf907491c7285576055e +SHA512 (ocrmypdf-10.2.0.tar.gz) = 10d26a3c60e0459a4fb46411b24f42b6f41e1b362f448a9858c56d0ec7a1847fd00bb5f599444fa8e2d3033a16be322c6641d0c6866e67d7306f67e0e2f3c2dd