Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package calibre for openSUSE:Factory checked 
in at 2026-08-01 18:33:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/calibre (Old)
 and      /work/SRC/openSUSE:Factory/.calibre.new.16738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "calibre"

Sat Aug  1 18:33:34 2026 rev:358 rq:1368821 version:9.12.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/calibre/calibre.changes  2026-07-06 
12:30:53.460387880 +0200
+++ /work/SRC/openSUSE:Factory/.calibre.new.16738/calibre.changes       
2026-08-01 18:36:51.339374653 +0200
@@ -1,0 +2,28 @@
+Fri Jul 31 07:28:09 UTC 2026 - ecsos <[email protected]> - 9.12.0
+
+- Update to 9.12.0
+  * New Features
+    - macOS: Add sharing of books via AirDop to the Connect/Share button
+    - Content server: Add support for plugins that can add new endpoints to 
the server backend
+    - Edit book: Compress images: Add an option to convert GIF images to 
JPEG/WebP
+    - ToC Editor: Add a button to sort the entries in the Table of Contents
+    - Content server: OPDS: Add kind metadata to feed links
+    - Kobo driver: Add support for latest Tolino firmware
+  * Bug Fixes
+    - E-book viewer: Fix an issue causing text area width to change when using 
section titles
+      in header/footers and the text is too long to fit in the space
+    - When adding books via calibre.exe fix --with-library not working.
+      Now calibre will switch to the specified library and only then add the 
book
+    - When evaluating recursive templates inherit python template policy
+    - Fix inability to input more than ~30K characters in custom tag like 
columns
+    - Fix some menu separators not rendering on some systems with high res 
monitors
+    - Content server: fix unstyled flash when transitioning between 
series/author views in dark mode
+    - Content server: Prevent unauthenticated users from updating annotations
+    - Edit metadata dialog: Fix right click menu->Remove format not working
+    - Edit book: fix typo in string format that broke convert PNG to JPEG 
function
+    - Linux binaries: Preload libxml2 to ensure the correct version is loaded 
despite Qt WebEngine probing
+- Rebase calibre-setup.install.py.diff
+- calibre-no-update.diff
+- Rebase calibre-disable_piper.patch
+
+-------------------------------------------------------------------

Old:
----
  calibre-9.11.0.tar.xz

New:
----
  calibre-9.12.0.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ calibre.spec ++++++
--- /var/tmp/diff_new_pack.Q4SJ88/_old  2026-08-01 18:36:52.915428910 +0200
+++ /var/tmp/diff_new_pack.Q4SJ88/_new  2026-08-01 18:36:52.915428910 +0200
@@ -30,7 +30,7 @@
 %{?sle15_python_module_pythons}
 
 Name:           calibre
-Version:        9.11.0
+Version:        9.12.0
 Release:        0
 Summary:        EBook Management Application
 License:        GPL-3.0-only
@@ -88,25 +88,27 @@
 BuildRequires:  chmlib-devel >= 0.40
 #BuildRequires:  dbus-1-python3 >= 1.2.0
 BuildRequires:  chmlib-devel >= 0.40
+# upstream use: freetype2-devel >= 2.14.1
 BuildRequires:  freetype2-devel >= 2.13.2
 BuildRequires:  graphite2-devel >= 1.3.14
 BuildRequires:  hyphen-devel >= 2.8.8
-#upstream use:  iconv >= 1.17
+#upstream use:  iconv >= 1.18
 BuildRequires:  liberation-fonts
-BuildRequires:  libmtp-devel >= 1.1.21
-# Upstream use libopenssl-devel >= 3.1.7
-BuildRequires:  libopenssl-3-devel >= 3.1.4
-BuildRequires:  libpoppler-devel >= 23.08.0
-BuildRequires:  libstemmer-devel >= 2.2.0
+BuildRequires:  libmtp-devel >= 1.1.22
+# upstream use: libopenssl-3-devel >= 3.5.7
+BuildRequires:  libopenssl-3-devel >= 3.5.3
+BuildRequires:  libpoppler-devel >= 25.11.0
+BuildRequires:  libstemmer-devel >= 3.0.1
 BuildRequires:  libwmf-devel >= 0.2.8
 %if 0%{suse_version} == 1600
-BuildRequires:  (libpodofo-devel >= 0.10.3 and libpodofo-devel < 1.0.0)
+BuildRequires:  (libpodofo-devel >= 0.10.5 and libpodofo-devel < 1.0.0)
 %else
-BuildRequires:  (libpodofo-0_10-devel >= 0.10.3 and libpodofo-0_10-devel < 
1.0.0)
+BuildRequires:  (libpodofo-0_10-devel >= 0.10.5 and libpodofo-0_10-devel < 
1.0.0)
 %endif
-# upstream use: mozjpeg >= 4.1.4
-BuildRequires:  optipng >= 0.7.7
-BuildRequires:  poppler-tools >= 23.08.0
+# upstream use: mozjpeg >= 4.1.5
+BuildRequires:  nodejs >= 22
+BuildRequires:  optipng >= 0.9.1
+BuildRequires:  poppler-tools >= 25.11.0
 BuildRequires:  python-rpm-macros
 BuildRequires:  qt6-core-private-devel >= %{my_qtversion}
 BuildRequires:  qt6-declarative-devel >= %{my_qtversion}
@@ -114,10 +116,12 @@
 BuildRequires:  qt6-imageformats-devel >= %{my_qtversion}
 BuildRequires:  qt6-platformsupport-private-devel >= %{my_qtversion}
 BuildRequires:  qt6-wayland-devel >= %{my_qtversion}
+BuildRequires:  pkgconfig(ffnvcodec) >= 11.1
 #BuildRequires:  python311-dbus-python
 BuildRequires:  xdg-utils >= 1.0.2
 BuildRequires:  pkgconfig(Qt6Core) >= %{my_qtversion}
 BuildRequires:  pkgconfig(Qt6Gui) >= %{my_qtversion}
+BuildRequires:  pkgconfig(Qt6Multimedia) >= %{my_qtversion}
 BuildRequires:  pkgconfig(Qt6Network) >= %{my_qtversion}
 BuildRequires:  pkgconfig(Qt6Positioning) >= %{my_qtversion}
 BuildRequires:  pkgconfig(Qt6Sensors) >= %{my_qtversion}
@@ -127,15 +131,15 @@
 BuildRequires:  pkgconfig(Qt6WebEngineCore) >= %{my_qtversion}
 BuildRequires:  pkgconfig(Qt6WebEngineWidgets) >= %{my_qtversion}
 BuildRequires:  pkgconfig(Qt6Widgets) >= %{my_qtversion}
-BuildRequires:  pkgconfig(dbus-glib-1) >= 0.112
+BuildRequires:  pkgconfig(dbus-glib-1) >= 0.114
 BuildRequires:  pkgconfig(espeak-ng)
-BuildRequires:  pkgconfig(fontconfig) >= 2.14.2
-BuildRequires:  pkgconfig(glib-2.0) >= 2.78.0
-BuildRequires:  pkgconfig(gpg-error) >= 1.47
+BuildRequires:  pkgconfig(fontconfig) >= 2.17.1
+BuildRequires:  pkgconfig(glib-2.0) >= 2.88.1
+# upstream use: pkgconfig(gpg-error) >= 1.56
+BuildRequires:  pkgconfig(gpg-error) >= 1.51
 BuildRequires:  pkgconfig(hunspell) >= 1.7.2
-###BuildRequires:  pkgconfig(icu-i18n) < 76.0
-BuildRequires:  pkgconfig(icu-i18n) >= 73.2
-# Upstream use 7.1
+BuildRequires:  pkgconfig(icu-i18n) >= 78.1
+# upstream use 7.1
 BuildRequires:  pkgconfig(libavcodec)
 BuildRequires:  pkgconfig(libavdevice)
 BuildRequires:  pkgconfig(libavfilter)
@@ -143,21 +147,23 @@
 BuildRequires:  pkgconfig(libavutil)
 BuildRequires:  pkgconfig(libswscale)
 #
-BuildRequires:  pkgconfig(libffi) >= 3.4.4
+BuildRequires:  pkgconfig(libffi) >= 3.5.2
 BuildRequires:  libjbig-devel >= 2.1
-BuildRequires:  pkgconfig(libgcrypt) >= 1.10.2
-BuildRequires:  pkgconfig(libjpeg) >= 3.0.0
+BuildRequires:  pkgconfig(libgcrypt) >= 1.11.3
+# upstream use: pkgconfig(libjpeg) >= 3.1.2
+BuildRequires:  pkgconfig(libjpeg) >= 3.0.4
 BuildRequires:  pkgconfig(libmspack)
-BuildRequires:  pkgconfig(libopenjp2) >= 2.5.0
-BuildRequires:  pkgconfig(libpng16) >= 1.6.40
-BuildRequires:  pkgconfig(libtiff-4) >= 4.6.0
-BuildRequires:  pkgconfig(libusb-1.0) >= 1.0.26
-BuildRequires:  pkgconfig(libwebp) >= 1.3.2
-# upstream use BuildRequires:  pkgconfig(ncurses) >= 6.4
-BuildRequires:  pkgconfig(ncurses) >= 6.1
-BuildRequires:  pkgconfig(readline) >= 8.2
-BuildRequires:  pkgconfig(sqlite3) >= 3.43.0
-BuildRequires:  pkgconfig(uchardet) >= 0.0.7
+# upstream use: pkgconfig(libopenjp2) >= 2.5.4
+BuildRequires:  pkgconfig(libopenjp2) >= 2.5.2
+# upstream use: pkgconfig(libpng16) >= 1.6.57
+BuildRequires:  pkgconfig(libpng16) >= 1.6.44
+BuildRequires:  pkgconfig(libtiff-4) >= 4.7.1
+BuildRequires:  pkgconfig(libusb-1.0) >= 1.0.30
+BuildRequires:  pkgconfig(libwebp) >= 1.6.0
+BuildRequires:  pkgconfig(ncurses) >= 6.5
+BuildRequires:  pkgconfig(readline) >= 8.3
+BuildRequires:  pkgconfig(sqlite3) >= 3.53.2
+BuildRequires:  pkgconfig(uchardet) >= 0.0.8
 # calibre no longer depends on ImageMagick
 # but keept BuildRequires to convert icon to serveral sizes
 BuildRequires:  pkgconfig(ImageMagick) >= 6.5.9
@@ -167,13 +173,14 @@
 BuildRequires:  %{python_module Deprecated >= 1.3.1}
 BuildRequires:  %{python_module FontTools >= 4.61.0}
 BuildRequires:  libjpeg-turbo >= 3.0.0
-BuildRequires:  pkgconfig(libxml-2.0) >= 2.10.3
-BuildRequires:  pkgconfig(libxslt) >= 1.1.39
+BuildRequires:  pkgconfig(lcms2) >= 2.17
+BuildRequires:  pkgconfig(libxml-2.0) >= 2.15.3
+BuildRequires:  pkgconfig(libxslt) >= 1.1.45
 # Not in suse BuildRequires:  %%{python_module MacFSEvents >= 0.8.4}
 BuildRequires:  %{python_module Markdown >= 3.10.0}
 BuildRequires:  %{python_module Pillow >= 12.1.1}
-BuildRequires:  %{python_module PyQt6 >= 6.10.0}
-BuildRequires:  %{python_module PyQt6-WebEngine >= 6.10.0}
+BuildRequires:  %{python_module PyQt6 >= 6.10.1}
+BuildRequires:  %{python_module PyQt6-WebEngine >= 6.10.1}
 BuildRequires:  %{python_module PyQt6-sip >= 13.10.2}
 BuildRequires:  %{python_module Pygments >= 2.20.0}
 BuildRequires:  %{python_module apsw >= 3.51.1.0}
@@ -199,7 +206,7 @@
 BuildRequires:  %{python_module multivolumefile >= 0.2.3}
 BuildRequires:  %{python_module netifaces >= 0.11.0}
 BuildRequires:  %{python_module psutil >= 7.1.3}
-# Upstream use py7zr >= 1.1.2
+# upstream use py7zr >= 1.1.2
 BuildRequires:  %{python_module py7zr >= 1.1.0}
 BuildRequires:  %{python_module pybcj >= 1.0.7}
 BuildRequires:  %{python_module pychm >= 0.8.6}
@@ -215,7 +222,7 @@
 BuildRequires:  %{python_module webencodings >= 0.5.1}
 BuildRequires:  %{python_module wrapt >= 2.0.1}
 BuildRequires:  %{python_module xxhash >= 3.6.0}
-# Upstream use zeroconf >= 0.148.0
+# upstream use zeroconf >= 0.148.0
 BuildRequires:  %{python_module zeroconf >= 0.136.0}
 BuildRequires:  %{python_module qt6-devel >= %{my_qtversion}}
 BuildRequires:  %{python_module qtwebengine-qt6 >= %{my_qtversion}}
@@ -235,7 +242,7 @@
 BuildRequires:  %{python_module setuptools_scm >= 9.2.2}
 BuildRequires:  %{python_module sip-devel >= 6.14.0}
 BuildRequires:  %{python_module wheel >= 0.46.2}
-# Upstream use pyqt-builder >= 1.19.1
+# upstream use pyqt-builder >= 1.19.1
 BuildRequires:  %{python_module pyqt-builder >= 1.19.0}
 BuildRequires:  %{python_module pywebpush}
 Requires(pretrans): findutils
@@ -244,25 +251,27 @@
 Requires:       %{python_flavor}-FontTools >= 4.61.0
 Requires:       bzip2 >= 1.0.8
 Requires:       chmlib >= 0.40
-Requires:       expat >= 2.4.4
+Requires:       expat >= 2.7.3
 Requires:       liberation-fonts
 Requires:       libjpeg-turbo >= 3.0.0
-Requires:       libmtp9 >= 1.1.21
-Requires:       libpng16-16 >= 1.6.40
-Requires:       libsqlite3-0 >= 3.43.0
+Requires:       libmtp9 >= 1.1.22
+Requires:       libpng16-16 >= 1.6.44
+Requires:       libsqlite3-0 >= 3.53.2
 Requires:       libwmf >= 0.2.8
-Requires:       optipng >= 0.7.7
+Requires:       optipng >= 0.9.1
 Requires:       poppler-tools >= 23.08.0
 Requires:       sqlite3 >= 3.43.0
-Requires:       unrar >= 6.2.11
+Requires:       unrar >= 7.2.2
 Requires:       xdg-utils >= 1.0.2
-Requires:       xz >= 5.4.1
-Requires:       zlib >= 1.2.13
+Requires:       xz >= 5.8.3
+# upstream use zlib >= 1.3.2
+Requires:       zlib >= 1.3.1
+Requires:       zstd >= 1.5.7
 # Not in suse Requires: %%{python_flavor}-MacFSEvents >= 0.8.4
 Requires:       %{python_flavor}-Markdown >= 3.10.0
 Requires:       %{python_flavor}-Pillow >= 12.1.1
-Requires:       %{python_flavor}-PyQt6 >= 6.10.0
-Requires:       %{python_flavor}-PyQt6-WebEngine >= 6.10.0
+Requires:       %{python_flavor}-PyQt6 >= 6.10.1
+Requires:       %{python_flavor}-PyQt6-WebEngine >= 6.10.1
 Requires:       %{python_flavor}-PyQt6-sip >= 13.10.2
 Requires:       %{python_flavor}-Pygments >= 2.20.0
 Requires:       %{python_flavor}-apsw >= 3.51.1.0
@@ -287,7 +296,7 @@
 Requires:       %{python_flavor}-multivolumefile >= 0.2.3
 Requires:       %{python_flavor}-netifaces >= 0.11.0
 Requires:       %{python_flavor}-psutil >= 7.1.3
-# Upstream use py7zr >= 1.1.2
+# upstream use py7zr >= 1.1.2
 Requires:       %{python_flavor}-py7zr >= 1.1.0
 Requires:       %{python_flavor}-pybcj >= 1.0.7
 Requires:       %{python_flavor}-pychm >= 0.8.6
@@ -303,7 +312,7 @@
 Requires:       %{python_flavor}-webencodings >= 0.5.1
 Requires:       %{python_flavor}-wrapt >= 2.0.1
 Requires:       %{python_flavor}-xxhash >= 3.6.0
-# Upstream use zeroconf >= 0.148.0
+# upstream use zeroconf >= 0.148.0
 Requires:       %{python_flavor}-zeroconf >= 0.136.0
 Requires:       %{python_flavor}-qt6 >= %{my_qtversion}
 Requires:       %{python_flavor}-qtwebengine-qt6 >= %{my_qtversion}

++++++ calibre-9.11.0.tar.xz -> calibre-9.12.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/calibre/calibre-9.11.0.tar.xz 
/work/SRC/openSUSE:Factory/.calibre.new.16738/calibre-9.12.0.tar.xz differ: 
char 15, line 1

++++++ calibre-disable_piper.patch ++++++
--- /var/tmp/diff_new_pack.Q4SJ88/_old  2026-08-01 18:36:52.979431114 +0200
+++ /var/tmp/diff_new_pack.Q4SJ88/_new  2026-08-01 18:36:52.983431251 +0200
@@ -1,7 +1,8 @@
-diff -Pdpru calibre-8.10.0.orig/setup/build.py calibre-8.10.0/setup/build.py
---- calibre-8.10.0.orig/setup/build.py 2025-09-05 01:58:58.000000000 +0200
-+++ calibre-8.10.0/setup/build.py      2025-09-15 15:22:33.949905212 +0200
-@@ -446,6 +446,8 @@ class Build(Command):
+Index: calibre-9.12.0/setup/build.py
+===================================================================
+--- calibre-9.12.0.orig/setup/build.py
++++ calibre-9.12.0/setup/build.py
+@@ -470,6 +470,8 @@ class Build(Command):
                  continue
              if not is_ext_allowed(self.compiling_for, ext):
                  continue
@@ -10,10 +11,11 @@
              if ext.error:
                  if ext.optional:
                      self.warn(ext.error)
-diff -Pdpru calibre-8.10.0.orig/setup/commands.py 
calibre-8.10.0/setup/commands.py
---- calibre-8.10.0.orig/setup/commands.py      2025-09-05 01:58:58.000000000 
+0200
-+++ calibre-8.10.0/setup/commands.py   2025-09-15 15:07:20.219859954 +0200
-@@ -30,7 +30,6 @@ __all__ = [
+Index: calibre-9.12.0/setup/commands.py
+===================================================================
+--- calibre-9.12.0.orig/setup/commands.py
++++ calibre-9.12.0/setup/commands.py
+@@ -33,7 +33,6 @@ __all__ = [
      'manual',
      'mathjax',
      'osx',
@@ -21,7 +23,7 @@
      'pot',
      'publish',
      'publish_betas',
-@@ -94,10 +93,6 @@ from setup.hyphenation import Hyphenatio
+@@ -98,10 +97,6 @@ from setup.hyphenation import Hyphenatio
  
  hyphenation = Hyphenation()
  
@@ -32,12 +34,13 @@
  from setup.liberation import LiberationFonts
  
  liberation_fonts = LiberationFonts()
-diff -Pdpru calibre-8.10.0.orig/setup/resources.py 
calibre-8.10.0/setup/resources.py
---- calibre-8.10.0.orig/setup/resources.py     2025-09-05 01:58:58.000000000 
+0200
-+++ calibre-8.10.0/setup/resources.py  2025-09-15 15:19:39.795613461 +0200
-@@ -104,7 +104,7 @@ class RapydScript(Command):  # {{{
- class Resources(Command):  # {{{
+Index: calibre-9.12.0/setup/resources.py
+===================================================================
+--- calibre-9.12.0.orig/setup/resources.py
++++ calibre-9.12.0/setup/resources.py
+@@ -116,7 +116,7 @@ class RapydScript(Command):  # {{{
  
+ class Resources(Command):  # {{{
      description = 'Compile various needed calibre resources'
 -    sub_commands = ['liberation_fonts', 'mathjax', 'rapydscript', 
'hyphenation', 'piper_voices']
 +    sub_commands = ['liberation_fonts', 'mathjax', 'rapydscript', 
'hyphenation']

++++++ calibre-no-update.diff ++++++
--- /var/tmp/diff_new_pack.Q4SJ88/_old  2026-08-01 18:36:53.003431939 +0200
+++ /var/tmp/diff_new_pack.Q4SJ88/_new  2026-08-01 18:36:53.007432077 +0200
@@ -1,17 +1,14 @@
-Index: calibre-7.23.0/src/calibre/gui2/main.py
+Index: calibre-9.12.0/src/calibre/gui2/main.py
 ===================================================================
---- calibre-7.23.0.orig/src/calibre/gui2/main.py
-+++ calibre-7.23.0/src/calibre/gui2/main.py
-@@ -52,8 +52,9 @@ various URL based actions is in the User
-                       help=_('Start minimized to system tray.'))
-     parser.add_option('-v', '--verbose', default=0, action='count',
-                       help=_('Ignored, do not use. Present only for legacy 
reasons'))
--    parser.add_option('--no-update-check', default=False, action='store_true',
--            help=_('Do not check for updates'))
-+    parser.add_option('--update-check', dest='no_update_check', default=True,
-+            action='store_false',
-+            help=_('Check for updates'))
-     parser.add_option('--ignore-plugins', default=False, action='store_true',
-             help=_('Ignore custom plugins, useful if you installed a plugin'
-                 ' that is preventing calibre from starting'))
+--- calibre-9.12.0.orig/src/calibre/gui2/main.py
++++ calibre-9.12.0/src/calibre/gui2/main.py
+@@ -52,7 +52,7 @@ various URL based actions is in the User
+     parser.add_option('--with-library', default=None, action='store', 
help=_('Use the library located at the specified path.'))
+     parser.add_option('--start-in-tray', default=False, action='store_true', 
help=_('Start minimized to system tray.'))
+     parser.add_option('-v', '--verbose', default=0, action='count', 
help=_('Ignored, do not use. Present only for legacy reasons'))
+-    parser.add_option('--no-update-check', default=False, 
action='store_true', help=_('Do not check for updates'))
++    parser.add_option('--update-check', dest='no_update_check', default=True, 
action='store_false', help=_('Check for updates'))
+     parser.add_option(
+         '--ignore-plugins',
+         default=False,
 

++++++ calibre-setup.install.py.diff ++++++
--- /var/tmp/diff_new_pack.Q4SJ88/_old  2026-08-01 18:36:53.039433179 +0200
+++ /var/tmp/diff_new_pack.Q4SJ88/_new  2026-08-01 18:36:53.043433317 +0200
@@ -1,13 +1,13 @@
-diff -Pdpru calibre-5.15.0.orig/setup/install.py 
calibre-5.15.0/setup/install.py
---- calibre-5.15.0.orig/setup/install.py       2021-04-16 04:20:00.000000000 
+0200
-+++ calibre-5.15.0/setup/install.py    2021-04-16 11:51:25.550511789 +0200
-@@ -87,10 +87,12 @@ class Develop(Command):
+Index: calibre-9.12.0/setup/install.py
+===================================================================
+--- calibre-9.12.0.orig/setup/install.py
++++ calibre-9.12.0/setup/install.py
+@@ -93,10 +93,11 @@ class Develop(Command):
+         opts = self.opts
          if not opts.prefix:
              opts.prefix = sys.prefix
-         for x in ('prefix', 'libdir', 'bindir', 'sharedir', 'staging_root',
--                'staging_libdir', 'staging_bindir', 'staging_sharedir'):
-+                'staging_libdir', 'staging_bindir', 'staging_sharedir',
-+                'mandir', 'locale_dir'):
+-        for x in ('prefix', 'libdir', 'bindir', 'sharedir', 'staging_root', 
'staging_libdir', 'staging_bindir', 'staging_sharedir'):
++        for x in ('prefix', 'libdir', 'bindir', 'sharedir', 'staging_root', 
'staging_libdir', 'staging_bindir', 'staging_sharedir', 'mandir', 'locale_dir'):
              o = getattr(opts, x, None)
              if o:
                  setattr(opts, x, os.path.abspath(o))
@@ -15,7 +15,7 @@
          self.libdir = getattr(opts, 'libdir', None)
          if self.libdir is None:
              self.libdir = self.j(opts.prefix, 'lib')
-@@ -98,6 +100,9 @@ class Develop(Command):
+@@ -104,6 +105,9 @@ class Develop(Command):
          if self.bindir is None:
              self.bindir = self.j(opts.prefix, 'bin')
          self.sharedir = getattr(opts, 'sharedir', None)
@@ -25,7 +25,7 @@
          if self.sharedir is None:
              self.sharedir = self.j(opts.prefix, 'share')
          if not getattr(opts, 'staging_root', None):
-@@ -111,9 +116,17 @@ class Develop(Command):
+@@ -117,9 +121,17 @@ class Develop(Command):
          self.staging_sharedir = getattr(opts, 'staging_sharedir', None)
          if self.staging_sharedir is None:
              self.staging_sharedir = opts.staging_sharedir = 
self.j(opts.staging_root, 'share')
@@ -43,7 +43,7 @@
          self.system_plugins_loc = opts.system_plugins_location
  
          if self.__class__.__name__ == 'Develop':
-@@ -125,6 +138,8 @@ class Develop(Command):
+@@ -131,6 +143,8 @@ class Develop(Command):
              self.info('INSTALL paths:')
              self.info('\tLIB:', self.staging_libdir)
              self.info('\tSHARE:', self.staging_sharedir)
@@ -52,20 +52,16 @@
  
      def pre_sub_commands(self, opts):
          if not (islinux or isbsd or ishaiku):
-@@ -250,6 +265,11 @@ class Install(Develop):
-                     'the launcher scripts. This option controls the prefix '
-                     'to which the install will actually copy files. By 
default '
-                     'it is set to the value of --prefix.'))
-+        parser.add_option('--staging-mandir',
-+            help='Where to put the calibre manpage files. Default is 
<root>/man')
-+        parser.add_option('--staging-locale-dir',
-+            dest="staging_localedir",
-+            help="Where to put the calibre locale files. Default is 
<root>/share/locale")
-         parser.add_option('--staging-libdir',
-             help='Where to put calibre library files. Default is <root>/lib')
-         parser.add_option('--staging-bindir',
-@@ -260,6 +280,49 @@ class Install(Develop):
-                 help='Path to a directory from which the installed calibre 
will load plugins')
+@@ -257,12 +271,57 @@ class Install(Develop):
+                 'it is set to the value of --prefix.'
+             ),
+         )
++        parser.add_option('--staging-mandir', help='Where to put the calibre 
manpage files. Default is <root>/man')
++        parser.add_option('--staging-locale-dir', dest="staging_localedir", 
help="Where to put the calibre locale files. Default is <root>/share/locale")
+         parser.add_option('--staging-libdir', help='Where to put calibre 
library files. Default is <root>/lib')
+         parser.add_option('--staging-bindir', help='Where to put the calibre 
binaries. Default is <root>/bin')
+         parser.add_option('--staging-sharedir', help='Where to put the 
calibre data files. Default is <root>/share')
+         parser.add_option('--system-plugins-location', help='Path to a 
directory from which the installed calibre will load plugins')
          self.add_postinstall_options(parser)
  
 +    def install_localefiles(self):

Reply via email to