From 96f62290bf573b4252f6f4cd8251a2fb563b91a1 Mon Sep 17 00:00:00 2001
From: Ionuț Arțăriși <mapleoin@fedoraproject.org>
Date: Jan 29 2010 13:39:39 +0000
Subject: new release: 0.9.36


---

diff --git a/.cvsignore b/.cvsignore
index 099a2d9..e1e4c89 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-calibre-0.6.35-nofonts.tar.gz
+calibre-0.6.36-nofonts.tar.gz
diff --git a/calibre-cssprofiles.patch b/calibre-cssprofiles.patch
index 3c8127f..23eac07 100644
--- a/calibre-cssprofiles.patch
+++ b/calibre-cssprofiles.patch
@@ -1,12 +1,15 @@
 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,7 @@ from xml.dom import SyntaxErr as CSSSynt
+@@ -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 calibre import cssutils_profiles 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.spec b/calibre.spec
index cf88985..3a1503f 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -1,6 +1,6 @@
 Name:           calibre
-Version:        0.6.35
-Release:        3%{?dist}
+Version:        0.6.36
+Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
 License:        GPLv3
@@ -103,8 +103,7 @@ OVERRIDE_CFLAGS="%{optflags}" python setup.py build
 rm -rf %{buildroot}
 
 # this is the only file we need from the provided cssutils package
-# need it for the install
-cp -p src/cssutils/profiles.py src/calibre/cssutils_profiles.py
+cp -p src/cssutils/profiles.py src/calibre/css_profiles.py
 
 mkdir -p %{buildroot}%{_datadir}
 
@@ -207,10 +206,6 @@ done;
             -e "s/iso639.mo/calibre_iso639.mo/"              \
             %{buildroot}%{_libdir}/%{name}/%{name}/utils/localization.py
 
-# this is the only file we need from the provided cssutils package
-cp -p src/cssutils/profiles.py %{buildroot}%{_libdir}/%{name}/%{name}/
-
-
 %{__rm} -f %{buildroot}%{_bindir}/%{name}-uninstall   
 
 %clean
@@ -249,6 +244,10 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Jan 29 2010 Ionuț C. Arțăriși <mapleoin@fedoraproject.org> - 0.6.36-1
+- new upstream release 0.6.36
+- fixed a cssprofiles issue with loading the profiles
+
 * Tue Jan 26 2010 Ionuț C. Arțăriși <mapleoin@fedoraproject.org> - 0.6.35-3
 - added -cssprofiles patch to cvs 
 
diff --git a/sources b/sources
index 822373a..fee2509 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9b66732ea5872666fdd05e933c1703df  calibre-0.6.35-nofonts.tar.gz
+7de5d968a53f4187a3accad47ea30bfb  calibre-0.6.36-nofonts.tar.gz