From 2497bcc10b13b5d7c8f38f13a3a251c5caa75ab1 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Nov 09 2012 23:28:05 +0000
Subject: Merge remote-tracking branch 'origin/master' into f17


---

diff --git a/.gitignore b/.gitignore
index a3c1b66..3e6ce24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -108,3 +108,4 @@ calibre-0.7.14-nofonts.tar.xz
 /calibre-0.9.1-nofonts.tar.xz
 /calibre-0.9.2-nofonts.tar.xz
 /calibre-0.9.4-nofonts.tar.xz
+/calibre-0.9.5-nofonts.tar.xz
diff --git a/calibre.spec b/calibre.spec
index 3bfc76c..82f8d6c 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           calibre
-Version:        0.9.4
-Release:        1%{?dist}
+Version:        0.9.5
+Release:        2%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
 License:        GPLv3
@@ -64,6 +64,7 @@ Requires:       liberation-mono-fonts
 Requires:       python-feedparser
 Requires:       python-netifaces
 Requires:       python-dns
+Requires:       python-cssselect
 %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
 
 %define __provides_exclude_from ^%{_libdir}/%{name}/%{name}/plugins/.*\.so$
@@ -273,6 +274,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{python_sitelib}/init_calibre.py*
 
 %changelog
+* Fri Nov 09 2012 Kevin Fenzi <kevin@scrye.com> 0.9.5-2
+- add python-cssselect to requires. Fixes bug #874332
+
+* Sat Nov 03 2012 Kevin Fenzi <kevin@scrye.com> 0.9.5-1
+- Update to 0.9.5
+
 * Tue Oct 30 2012 Kevin Fenzi <kevin@scrye.com> 0.9.4-1
 - Update to 0.9.4
 - Removed 0 length feedparser python files. Fixes bug #868108
diff --git a/sources b/sources
index 76043d0..0fc7a8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-81da41b409e023fa67439c793ac953b2  calibre-0.9.4-nofonts.tar.xz
+f1992b6af5a9ed81e702075f0a13ef9d  calibre-0.9.5-nofonts.tar.xz