[calibre] Update to 1.35.0
Kevin Fenzi
kevin at fedoraproject.org
Thu May 8 21:49:41 UTC 2014
commit a63a0aecd7ded4557cdb81957ca9baaf4d9f4c39
Author: Kevin Fenzi <kevin at scrye.com>
Date: Thu May 8 15:49:54 2014 -0600
Update to 1.35.0
.gitignore | 1 +
calibre.spec | 17 ++++++++++++++++-
sources | 2 +-
3 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c63d155..e0d94e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,3 +166,4 @@ calibre-0.7.14-nofonts.tar.xz
/calibre-1.32.0-nofonts.tar.xz
/calibre-1.33.0-nofonts.tar.xz
/calibre-1.34.0-nofonts.tar.xz
+/calibre-1.35.0-nofonts.tar.xz
diff --git a/calibre.spec b/calibre.spec
index 3c854a6..883f6e1 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -5,7 +5,7 @@
%global __provides_exclude_from ^%{_libdir}/%{name}/%{name}/plugins/.*\.so$
Name: calibre
-Version: 1.34.0
+Version: 1.35.0
Release: 1%{?dist}
Summary: E-book converter and library manager
Group: Applications/Multimedia
@@ -53,6 +53,7 @@ BuildRequires: qt-devel-private
BuildRequires: web-assets-devel
# calibre installer is so smart that it check for the presence of the
# directory (and then installs in the wrong place)
+BuildRequires: bash-completion
BuildRequires: python-apsw
#
# If python-feedparser is installed at build time there's problems with links.
@@ -145,6 +146,11 @@ mkdir -p %{buildroot}%{_datadir}/appdata
# the install script assumes it's there.
mkdir -p %{buildroot}%{python_sitelib}
+# create directory for completion files, so calibre knows where
+# to install them
+mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
+mkdir -p %{buildroot}%{_datadir}/zsh/site-functions
+
XDG_DATA_DIRS="%{buildroot}%{_datadir}" \
XDG_UTILS_INSTALL_MODE="system" \
LIBPATH="%{_libdir}" \
@@ -243,6 +249,10 @@ cp -p %{SOURCE2} %{buildroot}%{_bindir}/calibre-mount-helper
cp -p %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{buildroot}%{_datadir}/appdata/
+# fix the location of bash completion file
+find %{buildroot}%{_datadir}/bash-completion/
+mv %{buildroot}%{_datadir}/bash-completion/%{name} %{buildroot}%{_datadir}/bash-completion/completions/
+
%post
update-desktop-database &> /dev/null ||:
update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -297,9 +307,14 @@ ln -s %{_jsdir}/mathjax %{_datadir}/%{name}/viewer/
%{_datadir}/icons/hicolor/256x256/apps/calibre-ebook-edit.png
%{_datadir}/icons/hicolor/256x256/apps/calibre-viewer.png
%{python_sitelib}/init_calibre.py*
+%{_datadir}/bash-completion/completions/%{name}
+%{_datadir}/zsh/site-functions/_%{name}
%{_datadir}/appdata/calibre*.appdata.xml
%changelog
+* Thu May 08 2014 Kevin Fenzi <kevin at scrye.com> 1.35.0-1
+- Update to 1.35.0
+
* Thu Apr 24 2014 Kevin Fenzi <kevin at scrye.com> 1.34.0-1
- Update to 1.34.0
diff --git a/sources b/sources
index 7375039..db3fd09 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c4354078ee887f0228f7b0b8d095dfb9 calibre-1.34.0-nofonts.tar.xz
+589b6a4eea9b6648b1d887c64ae2fe09 calibre-1.35.0-nofonts.tar.xz
More information about the scm-commits
mailing list