diff options
| author | Larry Hajali <larryhaja[at]gmail[dot]com> | 2010-06-29 12:40:58 -0500 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2010-06-29 12:40:58 -0500 |
| commit | 276efb34ffd45f89cb48656808aaae211ed7d984 (patch) | |
| tree | 56b74d05e31d413aeba916897bdde51c3279a85a /office/calibre/patches | |
| parent | 85b9e6b82cf32ffa5422eaa707e93369fca8b194 (diff) | |
office/calibre: Updated for version 0.7.4.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'office/calibre/patches')
| -rw-r--r-- | office/calibre/patches/fix-manpages.patch | 21 | ||||
| -rw-r--r-- | office/calibre/patches/manpages-installation.patch | 44 |
2 files changed, 44 insertions, 21 deletions
diff --git a/office/calibre/patches/fix-manpages.patch b/office/calibre/patches/fix-manpages.patch deleted file mode 100644 index b9ea10be00ecd..0000000000000 --- a/office/calibre/patches/fix-manpages.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur calibre.orig/src/calibre/linux.py calibre/src/calibre/linux.py ---- calibre.orig/src/calibre/linux.py 2010-03-05 21:13:33.000000000 +0000 -+++ calibre/src/calibre/linux.py 2010-03-07 00:02:26.000000000 +0000 -@@ -325,7 +325,7 @@ - if isfreebsd: - manpath = os.path.join(self.opts.staging_root, 'man/man1') - else: -- manpath = os.path.join(self.opts.staging_sharedir, 'man/man1') -+ manpath = os.path.join(self.opts.staging_root, 'usr/man/man1') - if not os.path.exists(manpath): - os.makedirs(manpath) - self.info('Installing MAN pages...') -@@ -341,7 +341,7 @@ - if isfreebsd: - manfile = os.path.join(manpath, prog+'.1') - else: -- manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2') -+ manfile = os.path.join(manpath, prog+'.1'+'.bz2') - self.info('\tInstalling MAN page for', prog) - open(manfile, 'wb').write(raw) - self.manifest.append(manfile) diff --git a/office/calibre/patches/manpages-installation.patch b/office/calibre/patches/manpages-installation.patch new file mode 100644 index 0000000000000..60172acd1f60f --- /dev/null +++ b/office/calibre/patches/manpages-installation.patch @@ -0,0 +1,44 @@ +diff -Naur calibre.orig/src/calibre/linux.py calibre/src/calibre/linux.py +--- calibre.orig/src/calibre/linux.py 2010-06-20 00:32:31.000000000 +0000 ++++ calibre/src/calibre/linux.py 2010-06-20 19:45:45.000000000 +0000 +@@ -288,8 +288,8 @@ + def install_man_pages(self): + try: + from calibre.utils.help2man import create_man_page +- if isfreebsd: +- manpath = os.path.join(self.opts.staging_root, 'man/man1') ++ if islinux or isfreebsd: ++ manpath = os.path.join(self.opts.staging_root, 'usr/man/man1') + else: + manpath = os.path.join(self.opts.staging_sharedir, 'man/man1') + if not os.path.exists(manpath): +@@ -304,7 +304,7 @@ + continue + parser = parser() + raw = create_man_page(prog, parser) +- if isfreebsd: ++ if islinux or isfreebsd: + manfile = os.path.join(manpath, prog+'.1') + else: + manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2') +diff -Naur calibre.orig/src/calibre/utils/help2man.py calibre/src/calibre/utils/help2man.py +--- calibre.orig/src/calibre/utils/help2man.py 2010-06-20 00:32:32.000000000 +0000 ++++ calibre/src/calibre/utils/help2man.py 2010-06-20 19:52:20.000000000 +0000 +@@ -4,7 +4,7 @@ + __docformat__ = 'restructuredtext en' + + import time, bz2 +-from calibre.constants import isfreebsd ++from calibre.constants import islinux, isfreebsd + + from calibre.constants import __version__, __appname__, __author__ + +@@ -58,7 +58,7 @@ + lines = [x if isinstance(x, unicode) else unicode(x, 'utf-8', 'replace') for + x in lines] + +- if not isfreebsd: ++ if not islinux and not isfreebsd: + return bz2.compress((u'\n'.join(lines)).encode('utf-8')) + else: + return (u'\n'.join(lines)).encode('utf-8') |