Up to 1.4.0

diff --git a/calibre-env_module.patch b/calibre-env_module.patch
index e9c0cba266602040c5303416036d1085fc10d064..5ddc561b69f5f2c6d2054b7c9414da8d6c5d524a 100644 (file)
--- a/calibre-env_module.patch
+++ b/calibre-env_module.patch
@@ -1,23 +1,10 @@
---- calibre/setup/install.py~  2010-05-21 11:18:18.236682966 +0200
-+++ calibre/setup/install.py   2010-05-21 11:18:48.705841545 +0200
-@@ -132,20 +132,8 @@
-         self.setup_mount_helper()
+--- calibre/setup/install.py.orig      2013-09-21 13:01:38.006926552 +0200
++++ calibre/setup/install.py   2013-09-21 13:30:29.042536094 +0200
+@@ -130,7 +130,6 @@ class Develop(Command):
+         self.write_templates()
          self.install_files()
          self.run_postinstall()
 -        self.install_env_module()
          self.success()
  
--    def install_env_module(self):
--        import distutils.sysconfig as s
--        libdir = s.get_python_lib(prefix=self.opts.staging_root)
--        if os.path.exists(libdir):
--            path = os.path.join(libdir, 'init_calibre.py')
--            self.info('Installing calibre environment module: '+path)
--            with open(path, 'wb') as f:
--                f.write(HEADER.format(**self.template_args()))
--        else:
--            self.warn('Cannot install calibre environment module to: '+libdir)
--
-     def setup_mount_helper(self):
-         def warn():
-             self.warn('Failed to compile mount helper. Auto mounting of',
+     def install_env_module(self):

diff --git a/calibre.spec b/calibre.spec
index 147e9dd52e7474d82ca01b4ef51a4e7a4ba8aa5a..94b38511a5219bde8de04cb0735fcc9ff9dfc3fb 100644 (file)
--- a/calibre.spec
+++ b/calibre.spec
@@ -12,12 +12,12 @@
 Summary:       E-book converter and library management
 Summary(pl.UTF-8):     Konwerter oraz biblioteka dla e-booków
 Name:          calibre
-Version:       1.3.0
+Version:       1.4.0
 Release:       1
 License:       GPL v3+
 Group:         Applications/Multimedia
 Source0:       %{name}-%{version}-nofonts.tar.xz
-# Source0-md5: efd98761b20d50464a8e461fb6fe62b9
+# Source0-md5: e92582cc59205102f554b9a5a044e796
 Source1:       generate-tarball.sh
 Source2:       %{name}-mount-helper
 Patch0:                %{name}-prefix.patch
@@ -80,7 +80,6 @@ Suggests:     ImageMagick-coder-png
 ### FIXME: libunrar.so is needed for rar-packed files
 Suggests:      libunrar-devel
 Suggests:      poppler-progs
-Obsoletes:     bash-completion-calibre < 1.1.0-1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -110,6 +109,19 @@ najnowszych wiadomości z serwisów poświęconym e-książkom. Twórcy
 dołączyli również aplikację, którą użytkownik może wykorzystać jako
 swój własny serwer darmowych książek.
 
+%package -n bash-completion-calibre
+Summary:       bash-completion for calibre
+Summary(pl.UTF-8):     bashowe uzupełnianie nazw dla calibre
+Group:         Applications/Shells
+Requires:      %{name} = %{version}-%{release}
+Requires:      bash-completion
+
+%description -n bash-completion-calibre
+bash-completion for calibre.
+
+%description -n bash-completion-calibre -l pl.UTF-8
+Pakiet ten dostarcza bashowe uzupełnianie nazw dla calibre.
+
 %prep
 %setup -q -n %{name}
 %patch0 -p1
@@ -237,3 +249,7 @@ fi
 %{_datadir}/mime/packages/calibre-mimetypes.xml
 %{_pixmapsdir}/%{name}-gui.png
 %{_pixmapsdir}/calibre-viewer.png
+
+%files -n bash-completion-calibre
+%defattr(644,root,root,755)
+%{_sysconfdir}/bash_completion.d/*