packages: calibre/calibre-prefix.patch, calibre/calibre.spec - fix build on...

[lisu]

Author: lisu                         Date: Thu May 20 17:28:52 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix build on 64 bits

---- Files affected:
packages/calibre:
   calibre-prefix.patch (1.1 -> 1.2) , calibre.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/calibre/calibre-prefix.patch
diff -u packages/calibre/calibre-prefix.patch:1.1 packages/calibre/calibre-prefix.patch:1.2
--- packages/calibre/calibre-prefix.patch:1.1	Thu May 20 12:09:43 2010
+++ packages/calibre/calibre-prefix.patch	Thu May 20 19:28:46 2010
@@ -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')
  

================================================================
Index: packages/calibre/calibre.spec
diff -u packages/calibre/calibre.spec:1.6 packages/calibre/calibre.spec:1.7
--- packages/calibre/calibre.spec:1.6	Thu May 20 19:09:00 2010
+++ packages/calibre/calibre.spec	Thu May 20 19:28:46 2010
@@ -72,7 +72,8 @@
 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
@@ -90,6 +91,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2010/05/20 17:28:46  lisu
+- fix build on 64 bits
+
 Revision 1.6  2010/05/20 17:09:00  lisu
 - note how to upgrade without non-free fonts packaging (somebody has better idea?)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/calibre/calibre-prefix.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/calibre/calibre.spec?r1=1.6&r2=1.7&f=u