diff --git a/installer/linux/freeze.py b/installer/linux/freeze.py index 6e5bb0592b..c43c3f0ec5 100644 --- a/installer/linux/freeze.py +++ b/installer/linux/freeze.py @@ -48,6 +48,8 @@ def freeze(): '/usr/lib/libdbus-1.so.3', '/usr/lib/libopenjpeg.so.2', '/usr/lib/libxslt.so.1', + '/usr/lib64/libjpeg.so.7'.replace('64', '64' if is64bit + else ''), '/usr/lib/libxslt.so.1', '/usr/lib/libgthread-2.0.so.0', '/usr/lib/gcc/***-pc-linux-gnu/4.4.1/libstdc++.so.6'.replace('***', diff --git a/src/calibre/web/feeds/recipes/__init__.py b/src/calibre/web/feeds/recipes/__init__.py index 8ce81047b9..3979d542ed 100644 --- a/src/calibre/web/feeds/recipes/__init__.py +++ b/src/calibre/web/feeds/recipes/__init__.py @@ -56,6 +56,7 @@ recipe_modules = ['recipe_' + r for r in ( 'volksrant', 'theeconomictimes_india', 'ourdailybread', 'monitor', 'republika', 'beta', 'beta_en', 'glasjavnosti', 'esquire', 'livemint', 'thedgesingapore', 'darknet', 'rga', + 'intelligencer', )] diff --git a/src/calibre/web/feeds/recipes/recipe_intelligencer.py b/src/calibre/web/feeds/recipes/recipe_intelligencer.py new file mode 100644 index 0000000000..1b588a68bf --- /dev/null +++ b/src/calibre/web/feeds/recipes/recipe_intelligencer.py @@ -0,0 +1,45 @@ +#!/usr/bin/env python + +__license__ = 'GPL v3' +__copyright__ = '2009, Darko Miletic ' + +''' +Inteligencer.ca +''' + +from calibre.web.feeds.news import BasicNewsRecipe + +class Inteligencer(BasicNewsRecipe): + title = u'Intelligencer' + oldest_article = 7 + max_articles_per_feed = 100 + encoding = 'utf-8' + language = _('English') + no_stylesheets = True + use_embedded_content = False + lang = 'en-CA' + + conversion_options = { + 'language' : lang + , 'pretty_print' : True + } + + remove_attributes = ['style','width','height','font','border','align','action','onload'] + + keep_only_tags = [dict(name='td',attrs={'colspan':'2'})] + + remove_tags = [ + dict(name=['object','link','embed','iframe']) + ,dict(name='div',attrs={'id':'header'}) + ] + feeds = [(u'Recent News', u'http://www.intelligencer.ca/rss/')] + + def print_version(self, url): + return url.replace('/ArticleDisplay.aspx?','/PrintArticle.aspx?') + + def preprocess_html(self, soup): + for item in soup.findAll('td'): + del item['colspan'] + item.name = 'div' + return soup +