From d7cf6501783c98fb18e1ebef2016417f84d680111d834a00c57b10f228e07f1f Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven.kowalik@suse.com>
Date: Thu, 15 Sep 2022 05:29:35 +0000
Subject: [PATCH] - Update to 2.15.0:   * Fix remove/up/down rows when lower
 selected first.   * Use Cal6 get_icons() so icon themes apply   * Add check
 for multiple toc.ncx files, use last to match Calibre viewer.   * Explicitly
 set --output-profile=tablet when doing epub3->epub2 autoconvert     in BG.  
 * Changes for upcoming Qt6 Calibre   * Do merging in a BG ground.   * Do
 merge in temp files instead of memory.   * Automatically convert input epub3s
 to epub2s before merging.   * Bump min Calibre version.   * Fix FFF
 one-chapter story check - Create package directory layout using find and cp
 so new setuptools no   longer dies horribly. - Require calibre.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-epubmerge?expand=0&rev=8
---
 python-epubmerge.changes | 19 +++++++++++++++++++
 python-epubmerge.spec    | 13 +++++++++----
 v2.15.0.tar.gz           |  3 +++
 v2.9.0.tar.gz            |  3 ---
 4 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 v2.15.0.tar.gz
 delete mode 100644 v2.9.0.tar.gz

diff --git a/python-epubmerge.changes b/python-epubmerge.changes
index e17eced..9d1c70f 100644
--- a/python-epubmerge.changes
+++ b/python-epubmerge.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Thu Sep 15 05:26:40 UTC 2022 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Update to 2.15.0:
+  * Fix remove/up/down rows when lower selected first.
+  * Use Cal6 get_icons() so icon themes apply
+  * Add check for multiple toc.ncx files, use last to match Calibre viewer.
+  * Explicitly set --output-profile=tablet when doing epub3->epub2 autoconvert
+    in BG.
+  * Changes for upcoming Qt6 Calibre
+  * Do merging in a BG ground.
+  * Do merge in temp files instead of memory.
+  * Automatically convert input epub3s to epub2s before merging.
+  * Bump min Calibre version.
+  * Fix FFF one-chapter story check
+- Create package directory layout using find and cp so new setuptools no
+  longer dies horribly.
+- Require calibre.
+
 -------------------------------------------------------------------
 Tue Apr 21 09:20:06 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-epubmerge.spec b/python-epubmerge.spec
index 9ab68e4..7cbbabf 100644
--- a/python-epubmerge.spec
+++ b/python-epubmerge.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-epubmerge
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 %define upnamedown epubmerge
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-epubmerge
-Version:        2.9.0
+Version:        2.15.0
 Release:        0
 Summary:        EpubMerge Calibre Plugin
 License:        GPL-3.0-only
@@ -29,9 +29,10 @@ Source:         https://github.com/JimmXinu/EpubMerge/archive/v%{version}.tar.gz
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+Requires:       calibre >= 3.48.0
 Requires:       python-setuptools
 Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
 # converted to update-alternatives with 2.9.0 release
 Conflicts:      python2-%{upnamedown} < 2.9.0
 BuildArch:      noarch
@@ -61,6 +62,9 @@ merged books comments. These options are stored by Library.
 
 %prep
 %setup -q -n %{upname}-%{version}
+mkdir epubmerge
+find . -name '*.py' -maxdepth 1 -exec cp "{}" epubmerge \;
+rm epubmerge/setup.py
 
 %build
 %python_build
@@ -80,6 +84,7 @@ merged books comments. These options are stored by Library.
 %license LICENSE
 %doc README.md
 %python_alternative %{_bindir}/%{upnamedown}
-%{python_sitelib}/%{upname}*
+%{python_sitelib}/%{upnamedown}*
+%{python_sitelib}/%{upname}*info
 
 %changelog
diff --git a/v2.15.0.tar.gz b/v2.15.0.tar.gz
new file mode 100644
index 0000000..a414567
--- /dev/null
+++ b/v2.15.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1fe4cdb93f40c8b157c310ca39f6b2db180a995f3b5709ece64faea3baa547be
+size 553667
diff --git a/v2.9.0.tar.gz b/v2.9.0.tar.gz
deleted file mode 100644
index 3b31d98..0000000
--- a/v2.9.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8ad9797388b31f16de755a9713184d2811d84e14590f77798d91c778dacc64b7
-size 547092