From 723fed79556face57c1a52d7d172eb4c524a9ead Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@fedoraproject.org>
Date: Jul 11 2010 09:14:52 +0000
Subject: 0.7.8


---

diff --git a/.cvsignore b/.cvsignore
index 95c8486..d1f7883 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-calibre-0.7.7-nofonts.tar.bz2
+calibre-0.7.8-nofonts.tar.xz
diff --git a/calibre-cssprofiles.patch b/calibre-cssprofiles.patch
deleted file mode 100644
index 23eac07..0000000
--- a/calibre-cssprofiles.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up calibre/src/calibre/ebooks/oeb/stylizer.py.cssprofiles calibre/src/calibre/ebooks/oeb/stylizer.py
---- calibre/src/calibre/ebooks/oeb/stylizer.py.cssprofiles	2009-10-11 19:44:34.190050494 +0300
-+++ calibre/src/calibre/ebooks/oeb/stylizer.py	2009-10-11 19:44:54.840926064 +0300
-@@ -18,7 +18,10 @@ from xml.dom import SyntaxErr as CSSSynt
- import cssutils
- from cssutils.css import CSSStyleRule, CSSPageRule, CSSStyleDeclaration, \
-     CSSValueList, CSSFontFaceRule, cssproperties
--from cssutils import profile as cssprofiles
-+from cssutils import errorhandler
-+log = errorhandler.ErrorHandler()
-+from calibre.css_profiles import Profiles
-+cssprofiles = Profiles(log=log)
- from lxml import etree
- from lxml.cssselect import css_to_xpath, ExpressionError, SelectorSyntaxError
- from calibre.ebooks.oeb.base import XHTML, XHTML_NS, CSS_MIME, OEB_STYLES
diff --git a/calibre-executables.patch b/calibre-executables.patch
deleted file mode 100644
index 1ac0bd9..0000000
--- a/calibre-executables.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up calibre/setup/install.py.executables calibre/setup/install.py
---- calibre/setup/install.py.executables	2010-01-06 11:12:45.214637969 +0200
-+++ calibre/setup/install.py	2010-01-06 11:12:58.056763017 +0200
-@@ -185,7 +185,7 @@ class Develop(Command):
-         script = template.format(
-                 module=mod, func=func,
-                 path=self.libdir, resources=self.sharedir,
--                executables=self.staging_bindir,
-+                executables=self.bindir,
-                 extensions=self.j(self.libdir, 'calibre', 'plugins'))
-         path = self.j(self.staging_bindir, name)
-         if not os.path.exists(self.staging_bindir):
diff --git a/calibre.spec b/calibre.spec
index 37165fd..adcedc5 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           calibre
-Version:        0.7.7
+Version:        0.7.8
 Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
@@ -16,7 +16,7 @@ URL:            http://calibre-ebook.com/
 # Download the upstream tarball and invoke this script while in the tarball's
 # directory:
 # ./generate-tarball.sh %{version}
-Source0:        %{name}-%{version}-nofonts.tar.bz2
+Source0:        %{name}-%{version}-nofonts.tar.xz
 Source1:        generate-tarball.sh
 Patch0:         %{name}-manpages.patch
 Patch1:         %{name}-no-update.patch
@@ -250,6 +250,10 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Sun Jul 11 2010 Michal Nowak <mnowak@redhat.com> - 0.7.8-1
+- Update to 0.7.8
+- build tar.xz instead of tar.bz2
+
 * Fri Jul 02 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.7-1
 - Update to 0.7.7
 
diff --git a/generate-tarball.sh b/generate-tarball.sh
index 2122046..c7f8138 100644
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@@ -6,4 +6,4 @@ tar -xvzf calibre-$VERSION.tar.gz
 rm -f calibre/resources/fonts/liberation/*
 rm -f calibre/resources/fonts/prs500/*
 
-tar -cvjf calibre-$VERSION-nofonts.tar.bz2 calibre
+tar -cvJf calibre-$VERSION-nofonts.tar.xz calibre
diff --git a/import.log b/import.log
index 641a1a9..38f7b1d 100644
--- a/import.log
+++ b/import.log
@@ -1,2 +1,3 @@
 calibre-0_6_19-3_fc11:HEAD:calibre-0.6.19-3.fc11.src.rpm:1257067210
 calibre-0_6_21-1_fc12:HEAD:calibre-0.6.21-1.fc12.src.rpm:1257613504
+calibre-0_7_8-1_fc13:HEAD:calibre-0.7.8-1.fc13.src.rpm:1278839629
diff --git a/sources b/sources
index a8742cb..412557d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0726eca216ba6deec21c40c1258dea66  calibre-0.7.7-nofonts.tar.bz2
+9df8778c74ef6c9101261d666c80b86d  calibre-0.7.8-nofonts.tar.xz