- fix build on 64 bits

Changed files:
    calibre-prefix.patch -> 1.2
    calibre.spec -> 1.7

diff --git a/calibre-prefix.patch b/calibre-prefix.patch
index f6b3638bb4e58d2a0935c968e811d22a973d9de9..31a94fc99704154e09d16fdd2b1800b94542f2a6 100644 (file)
--- 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 b85155dca1b31be700683dd8472126c40f04eb13..ba4fc847392def34091253264fb84a9f3ead52dd 100644 (file)
--- 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