diff --git a/_service b/_service
index 540cbb2..52f7de3 100644
--- a/_service
+++ b/_service
@@ -1,6 +1,6 @@
- 2022.1.8+git
+ 2022.4.18+git
https://github.com/wustho/epy.git
git
.git*
@@ -10,7 +10,6 @@
gz
*.tar
- enable
diff --git a/_servicedata b/_servicedata
index 57badc1..e7dd426 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://github.com/wustho/epy.git
- c1f9b4e9281e0f5f26b9473ca3f4b3f78412464d
\ No newline at end of file
+ 50dd4faf4ca095b8f10a1883ca1168a2628e877e
\ No newline at end of file
diff --git a/epy-2022.1.8+git.1641653565.c1f9b4e.tar.gz b/epy-2022.1.8+git.1641653565.c1f9b4e.tar.gz
deleted file mode 100644
index d4a0dad..0000000
--- a/epy-2022.1.8+git.1641653565.c1f9b4e.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:12f446e0a35f464c82e8d64579880ca539b26584757a82ceb79b12c6a23325e4
-size 204742
diff --git a/epy-2022.4.18+git.1650237821.50dd4fa.tar.gz b/epy-2022.4.18+git.1650237821.50dd4fa.tar.gz
new file mode 100644
index 0000000..5a65aee
--- /dev/null
+++ b/epy-2022.4.18+git.1650237821.50dd4fa.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0536b120bff25c743933c78a9319230214dc402a2b0926b81469ee777bfc8f82
+size 186842
diff --git a/epy.changes b/epy.changes
index f43543a..a334786 100644
--- a/epy.changes
+++ b/epy.changes
@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Mon Apr 25 07:37:33 UTC 2022 - mcepl@cepl.eu
+
+- Update to version 2022.4.18+git.1650237821.50dd4fa:
+ * Bugfix #57: Unresolved relative path for epub contents
+ * Update dev env configurations
+ * Add wkdict to supported dict backends
+ * docs: define word setup (#55)
+ * Add signal handler
+ * Breakdown parse_cli_args into its own method
+ * Remove body: from workflow
+ * Move sponsor to FUNDING
+ * Update changelog in README
+ * Add debugger on parallel letter counting process
+ * Fix process.join() issue for unstarted process
+ * Bugfix #51: Stop/prevent scrolling at the end of ebook
+ * Add 'force_wait' for letters counting process
+ * Add library menu
+ * Verbose loader
+ * Fixed url parser with pathlib.PurePosixPath
+ * CLI help interface
+ * More explicit 'content_path'
+ * Hotfix: image location reference issue
+ * Hotfix: url meta window issue and update version
+ * URL early support
+ * Improve cli help interface
+ * New implementation of cli args parser
+ * Restructured tests
+ * Add vim config
+- Run tests
+
-------------------------------------------------------------------
Sat Jan 08 23:30:07 UTC 2022 - mcepl@cepl.eu
diff --git a/epy.spec b/epy.spec
index b478b1c..9a1d52e 100644
--- a/epy.spec
+++ b/epy.spec
@@ -17,7 +17,7 @@
Name: epy
-Version: 2022.1.8+git.1641653565.c1f9b4e
+Version: 2022.4.18+git.1650237821.50dd4fa
Release: 0
Summary: CLI ebook reader
License: GPL-3.0-only
@@ -25,12 +25,18 @@ URL: https://github.com/wustho/epy
# Source: https://files.pythonhosted.org/packages/source/e/epy-reader/epy-reader-%%{version}.tar.gz#/epy-%%{version}.tar.gz
Source: epy-%{version}.tar.gz
BuildRequires: fdupes
+BuildRequires: python3-curses
BuildRequires: python3-mobi
+BuildRequires: python3-pip
+BuildRequires: python3-poetry-core
+BuildRequires: python3-pytest
BuildRequires: python3-setuptools
+BuildRequires: python3-wheel
+Requires: python3-curses
Requires: python3-mobi
-Suggests: sdcv
Suggests: dictd
Suggests: mimic
+Suggests: sdcv
BuildArch: noarch
%description
@@ -45,7 +51,8 @@ CLI Ebook reader. Fork of epr with these extra features:
Reading progress percentage
Bookmarks
External dictionary integration (sdcv or dict)
- Inline formats: bold and italic (depend on terminal and font capability. Italic only supported in python>=3.7)
+ Inline formats: bold and italic (depend on terminal and font
+ capability. Italic only supported in python>=3.7)
Text-to-Speech (with additional setup)
Double Spread
@@ -53,13 +60,23 @@ CLI Ebook reader. Fork of epr with these extra features:
%autosetup -p1 -n epy-%{version}
# All those shebangs are just harmful
-find . -name \*.py -exec sed -i "1{/#!\/usr\/bin\/env python/d}" '{}' \;
+find . -name \*.py -print0 | while IFS= read -r -d $'\0' script; do
+ sed -i "1{/#!\s*\/usr\/bin\/\(env \)\?python/d}" "$script"
+ chmod -x "$script"
+done
%build
-python3 setup.py build
+python3 -mpip wheel --no-deps --disable-pip-version-check --use-pep517 \
+ --no-build-isolation --progress-bar off --verbose . -w build/
%install
-python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
+python3 -mpip install --root %{buildroot} --no-warn-script-location \
+ --disable-pip-version-check --no-compile --no-deps --progress-bar off \
+ build/epy_reader-*-py3-none-any.whl
+
+%check
+export PYTHONPATH=%{buildroot}/%{python3_sitelib}
+pytest -v tests
%files
%doc README.md