rpms/calibre/devel .cvsignore, 1.10, 1.11 calibre-cssprofiles.patch, 1.3, 1.4 calibre.spec, 1.11, 1.12 sources, 1.10, 1.11
Ionuț Arțăriși
mapleoin at fedoraproject.org
Fri Jan 29 13:28:35 UTC 2010
Author: mapleoin
Update of /cvs/pkgs/rpms/calibre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4702
Modified Files:
.cvsignore calibre-cssprofiles.patch calibre.spec sources
Log Message:
new version 0.6.36
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore 25 Jan 2010 12:47:58 -0000 1.10
+++ .cvsignore 29 Jan 2010 13:28:35 -0000 1.11
@@ -1 +1 @@
-calibre-0.6.35-nofonts.tar.gz
+calibre-0.6.36-nofonts.tar.gz
calibre-cssprofiles.patch:
stylizer.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
Index: calibre-cssprofiles.patch
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/calibre-cssprofiles.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- calibre-cssprofiles.patch 26 Jan 2010 16:25:46 -0000 1.3
+++ calibre-cssprofiles.patch 29 Jan 2010 13:28:35 -0000 1.4
@@ -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
Index: calibre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/calibre.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- calibre.spec 26 Jan 2010 16:25:46 -0000 1.11
+++ calibre.spec 29 Jan 2010 13:28:35 -0000 1.12
@@ -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 set
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 at 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 at fedoraproject.org> - 0.6.35-3
- added -cssprofiles patch to cvs
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 25 Jan 2010 12:47:58 -0000 1.10
+++ sources 29 Jan 2010 13:28:35 -0000 1.11
@@ -1 +1 @@
-9b66732ea5872666fdd05e933c1703df calibre-0.6.35-nofonts.tar.gz
+7de5d968a53f4187a3accad47ea30bfb calibre-0.6.36-nofonts.tar.gz
More information about the scm-commits
mailing list