From f97504aa046656e545dda75daab4483c47e709ca Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mar 12 2012 15:47:19 +0000
Subject: Merge remote-tracking branch 'origin/master' into f17


Conflicts:
	calibre.spec

---

diff --git a/.gitignore b/.gitignore
index b26d1c4..80bef38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,6 @@ calibre-0.7.14-nofonts.tar.xz
 /calibre-0.8.36-nofonts.tar.xz
 /calibre-0.8.37-nofonts.tar.xz
 /calibre-0.8.39-nofonts.tar.xz
+/calibre-0.8.40-nofonts.tar.xz
+/calibre-0.8.41-nofonts.tar.xz
+/calibre-0.8.42-nofonts.tar.xz
diff --git a/calibre.spec b/calibre.spec
index de0c11c..0840557 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.8.39
-Release:        2%{?dist}
+Version:        0.8.42
+Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
 License:        GPLv3
@@ -256,10 +256,19 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man1/*
 
 %changelog
-* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.39-2
-- Rebuilt for c++ ABI breakage
+* Mon Mar 12 2012 Kevin Fenzi <kevin@scrye.com> - 0.8.42-1
+- Update to 0.8.42
 
-* Fri Feb 10 2012 Kevin Fenzi <kevin@scrye.com> 0.8.39-1
+* Thu Mar 01 2012 Kevin Fenzi <kevin@scrye.com> - 0.8.41-2
+- Rebuild for new ImageMagick
+
+* Fri Feb 24 2012 Kevin Fenzi <kevin@scrye.com> - 0.8.41-1
+- Update to 0.8.41
+
+* Fri Feb 17 2012 Kevin Fenzi <kevin@scrye.com> - 0.8.40-1
+- Update to 0.8.40
+
+* Fri Feb 10 2012 Kevin Fenzi <kevin@scrye.com> - 0.8.39-1
 - Update to 0.8.39
 
 * Fri Jan 27 2012 Kevin Fenzi <kevin@scrye.com> - 0.8.37-1
diff --git a/sources b/sources
index 4e08abc..93f8e0d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cda686337f1bb4737d717acc7924ff6e  calibre-0.8.39-nofonts.tar.xz
+43730ea0110e0709446c87d9154579fa  calibre-0.8.42-nofonts.tar.xz