From 9c8cebf1cddec13e7446cff8889510d1aafea16e Mon Sep 17 00:00:00 2001 From: lisu Date: Thu, 20 May 2010 17:28:46 +0000 Subject: [PATCH] - fix build on 64 bits Changed files: calibre-prefix.patch -> 1.2 calibre.spec -> 1.7 --- calibre-prefix.patch | 2 +- calibre.spec | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/calibre-prefix.patch b/calibre-prefix.patch index f6b3638..31a94fc 100644 --- a/calibre-prefix.patch +++ b/calibre-prefix.patch @@ -14,7 +14,7 @@ - if self.staging_sharedir is None: - self.staging_sharedir = opts.staging_sharedir = self.j(opts.staging_root, 'share') + -+ self.staging_libdir = opts.staging_libdir = self.j(opts.staging_root, 'usr/', 'lib') ++ self.staging_libdir = opts.staging_libdir = opts.staging_root + self.libdir + self.staging_bindir = opts.staging_bindir = self.j(opts.staging_root, 'usr/', 'bin') + self.staging_sharedir = opts.staging_sharedir = self.j(opts.staging_root, 'usr/', 'share') diff --git a/calibre.spec b/calibre.spec index b85155d..ba4fc84 100644 --- a/calibre.spec +++ b/calibre.spec @@ -71,7 +71,8 @@ CBR, CBZ, RTF, TXT, PDF and LRS. rm -rf $RPM_BUILD_ROOT %{__python} setup.py install \ - --root=$RPM_BUILD_ROOT + --root=$RPM_BUILD_ROOT \ + --libdir=%{_libdir} %clean rm -rf $RPM_BUILD_ROOT -- 2.44.0