rpms/calibre/devel calibre-cssprofiles.patch, 1.2, 1.3 calibre.spec, 1.10, 1.11

[Ionuț Arțăriși]

Author: mapleoin

Update of /cvs/pkgs/rpms/calibre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13043

Modified Files:
	calibre.spec 
Added Files:
	calibre-cssprofiles.patch 
Log Message:
fixed wrong cssutils 0.9.6 dependency

calibre-cssprofiles.patch:
 stylizer.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: calibre-cssprofiles.patch
===================================================================
RCS file: calibre-cssprofiles.patch
diff -N calibre-cssprofiles.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ calibre-cssprofiles.patch	26 Jan 2010 16:25:46 -0000	1.3
@@ -0,0 +1,12 @@
+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
+ 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 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


Index: calibre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/calibre.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- calibre.spec	25 Jan 2010 12:47:58 -0000	1.10
+++ calibre.spec	26 Jan 2010 16:25:46 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           calibre
 Version:        0.6.35
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
 License:        GPLv3
@@ -18,6 +18,7 @@ Source0:        %{name}-%{version}-nofon
 Source1:        generate-tarball.sh
 Patch0:         %{name}-manpages.patch
 Patch1:         %{name}-no-update.patch
+Patch2:         %{name}-cssprofiles.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python >= 2.6
@@ -39,7 +40,7 @@ BuildRequires:  python-BeautifulSoup
 Requires:       PyQt4
 Requires:       pyPdf
 Requires:       python-cherrypy
-Requires:       python-cssutils >= 0.9.6
+Requires:       python-cssutils
 Requires:       ImageMagick
 Requires:       odfpy
 Requires:       django-tagging
@@ -74,6 +75,10 @@ TXT, PDF and LRS.
 # don't check for new upstream version (that's what packagers do)
 %patch1 -p1 -b .no-update
 
+# we've moved the profiles so we don't have to redistribute cssutils
+# until 0.9.6 comes to fedora
+%patch2 -p1 -b .cssprofiles
+
 # dos2unix newline conversion
 %{__sed} -i 's/\r//' src/calibre/web/feeds/recipes/*
 
@@ -244,6 +249,12 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jan 26 2010 Ionuț C. Arțăriși <mapleoin at fedoraproject.org> - 0.6.35-3
+- added -cssprofiles patch to cvs 
+
+* Tue Jan 26 2010 Ionuț C. Arțăriși <mapleoin at fedoraproject.org> - 0.6.35-2
+- remove python-cssutils 0.9.6 dependency
+
 * Mon Jan 25 2010 Ionuț C. Arțăriși <mapleoin at fedoraproject.org> - 0.6.35-1
 - new upstream release
 - fedora includes cssutils >= 0.9.6 now; removed the cssprofiles patch