From 29d842db3ed632afc4402a9537d444e68b27d1d5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 20 Feb 2009 09:28:47 -0800
Subject: [PATCH] IGN:Fix #1901 (Recipe update for EPUB generation)

---
 src/calibre/trac/plugins/templates/linux.html      |  5 ++++-
 src/calibre/web/feeds/recipes/recipe_la_segunda.py | 13 ++++++-------
 upload.py                                          |  8 +++++++-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/calibre/trac/plugins/templates/linux.html b/src/calibre/trac/plugins/templates/linux.html
index 5f0f287737..066f3c9b6d 100644
--- a/src/calibre/trac/plugins/templates/linux.html
+++ b/src/calibre/trac/plugins/templates/linux.html
@@ -114,10 +114,13 @@ sudo python -c "import urllib2; exec urllib2.urlopen('http://calibre.kovidgoyal.
 wget -O- http://calibre.kovidgoyal.net/downloads/${app}-${version}.tar.gz | tar xvz 
 cd calibre*
 python setup.py build &amp;&amp; sudo python setup.py install
+sudo calibre_postinstall
                                 </pre>
                                 Note that if your distribution does not have a
                                 correctly compiled libunrar.so, ${app} will not 
-                                support rar files.
+                                support rar files. The calibre_postinstall step 
+                                is required for device detection and integration
+                                with your desktop environment.
                             </p>
                         </div>
                     </td>
diff --git a/src/calibre/web/feeds/recipes/recipe_la_segunda.py b/src/calibre/web/feeds/recipes/recipe_la_segunda.py
index d049d9c92b..5852e6ba9a 100644
--- a/src/calibre/web/feeds/recipes/recipe_la_segunda.py
+++ b/src/calibre/web/feeds/recipes/recipe_la_segunda.py
@@ -6,8 +6,8 @@ __copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
 lasegunda.com
 '''
 
-from calibre.web.feeds.news import BasicNewsRecipe
-
+from calibre.web.feeds.news import BasicNewsRecipe
+
 class LaSegunda(BasicNewsRecipe):
     title                 = 'La Segunda'
     __author__            = 'Darko Miletic'
@@ -21,14 +21,16 @@ class LaSegunda(BasicNewsRecipe):
     encoding              = 'cp1252'
     cover_url             = 'http://www.lasegunda.com/imagenes/logotipo_lasegunda_Oli.gif'
     remove_javascript     = True
+    language              = _('Spanish')    
     
     html2lrf_options = [
-                          '--comment', description
+                          '--comment', description
                         , '--category', category
                         , '--publisher', publisher
+                        , '--ignore-tables'
                         ]
     
-    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"' 
+    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\nlinearize_tables=True\noverride_css=" p {text-indent: 0em; margin-top: 0em; margin-bottom: 0.5em} "' 
                         
     keep_only_tags = [dict(name='table')]
                         
@@ -52,10 +54,7 @@ class LaSegunda(BasicNewsRecipe):
     def preprocess_html(self, soup):
         mtag = '<meta http-equiv="Content-Language" content="es-CL"/>'
         soup.head.insert(0,mtag)
-        for item in soup.findAll(name='table', width=True):
-            del item['width']
         for item in soup.findAll(style=True):
             del item['style']
         return soup
     
-    language = _('Spanish')    
\ No newline at end of file
diff --git a/upload.py b/upload.py
index 5bd473e08d..2aeb1461ee 100644
--- a/upload.py
+++ b/upload.py
@@ -284,7 +284,13 @@ class gui(OptionlessCommand):
                 manifest = '<RCC>\n<qresource prefix="/">\n%s\n</qresource>\n</RCC>'%'\n'.join(files)
                 with open('images.qrc', 'wb') as f:
                     f.write(manifest)
-                check_call(['pyrcc4', '-o', images, 'images.qrc'])
+                try:
+                    check_call(['pyrcc4', '-o', images, 'images.qrc'])
+                except:
+                    import traceback
+                    traceback.print_exc()
+                    raise Exception('You do not have pyrcc4 in your PATH. '
+                                    'Install the PyQt4 development tools.')
             else:
                 print 'Images are up to date'
         finally: