[calibre] Update to 1.23.0
Kevin Fenzi
kevin at fedoraproject.org
Fri Feb 7 16:43:24 UTC 2014
commit d5abe051f82e1d6a319f6c0c9efa58ed23303fbd
Author: Kevin Fenzi <kevin at scrye.com>
Date: Fri Feb 7 09:43:53 2014 -0700
Update to 1.23.0
- Add BuildConflicts: python-feedparser. Bug #1026469
.gitignore | 1 +
calibre.spec | 12 ++++++++++--
sources | 2 +-
3 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b193e62..2efc67b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -156,3 +156,4 @@ calibre-0.7.14-nofonts.tar.xz
/calibre-1.20.0-nofonts.tar.xz
/calibre-1.21.0-nofonts.tar.xz
/calibre-1.22.0-nofonts.tar.xz
+/calibre-1.23.0-nofonts.tar.xz
diff --git a/calibre.spec b/calibre.spec
index 68f85ca..d090448 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -5,8 +5,8 @@
%global __provides_exclude_from ^%{_libdir}/%{name}/%{name}/plugins/.*\.so$
Name: calibre
-Version: 1.22.0
-Release: 2%{?dist}
+Version: 1.23.0
+Release: 1%{?dist}
Summary: E-book converter and library manager
Group: Applications/Multimedia
License: GPLv3
@@ -55,6 +55,10 @@ BuildRequires: web-assets-devel
# 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.
+# See https://bugzilla.redhat.com/show_bug.cgi?id=1026469
+BuildConflicts: python-feedparser
Requires: PyQt4
Requires: python-cherrypy
@@ -306,6 +310,10 @@ ln -s %{_jsdir}/mathjax %{_datadir}/%{name}/viewer/
%{_datadir}/appdata/calibre*.appdata.xml
%changelog
+* Fri Feb 07 2014 Kevin Fenzi <kevin at scrye.com> 1.23.0-1
+- Update to 1.23.0
+- Add BuildConflicts: python-feedparser. Bug #1026469
+
* Sun Feb 02 2014 Kevin Fenzi <kevin at scrye.com> 1.22.0-2
- Install calibre-ebook-edit icon properly. Fixes bug #1060556
diff --git a/sources b/sources
index e343a73..7f47b15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e960c2672764156c5c65b29345567bc5 calibre-1.22.0-nofonts.tar.xz
+40cb6bb0d56698b245ac80a0ced9b506 calibre-1.23.0-nofonts.tar.xz
More information about the scm-commits
mailing list