packages: hplip/hplip-binary-fixup.patch, hplip/hplip.spec - rel 2; patch b...

[arekm]

Author: arekm                        Date: Wed Nov 30 19:07:46 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; patch binary plugin for 64bit, too

---- Files affected:
packages/hplip:
   hplip-binary-fixup.patch (1.2 -> 1.3) , hplip.spec (1.92 -> 1.93) 

---- Diffs:

================================================================
Index: packages/hplip/hplip-binary-fixup.patch
diff -u packages/hplip/hplip-binary-fixup.patch:1.2 packages/hplip/hplip-binary-fixup.patch:1.3
--- packages/hplip/hplip-binary-fixup.patch:1.2	Wed Nov 30 19:12:29 2011
+++ packages/hplip/hplip-binary-fixup.patch	Wed Nov 30 20:07:40 2011
@@ -1,6 +1,5 @@
-diff -urN hplip-3.11.10.org/base/pkit.py hplip-3.11.10/base/pkit.py
---- hplip-3.11.10.org/base/pkit.py	2011-10-02 05:06:15.000000000 +0200
-+++ hplip-3.11.10/base/pkit.py	2011-11-30 19:12:09.944970086 +0100
+--- hplip-3.11.10/base/pkit.py.org	2011-11-30 20:01:59.640469386 +0100
++++ hplip-3.11.10/base/pkit.py	2011-11-30 20:06:43.216664960 +0100
 @@ -30,6 +30,11 @@
  import shutil
  import stat
@@ -13,7 +12,7 @@
  # Local
  from base.logger import *
  from base.g import *
-@@ -318,7 +323,28 @@
+@@ -318,7 +323,31 @@
              log.debug("shutdown: %s" % str(e))
              return False
  
@@ -23,8 +22,11 @@
 +        # file, md5sum, replace content at address with specified byte
 +        patches = { 'lj-x86_32.so' : { 'md5': '30bdf8c844508a53d80362f9eba670c5',
 +                                       # https://bugs.launchpad.net/hplip/+bug/666780
-+                                       'replace' : [ (0xA068, 0x10) ]
-+                } }
++                                       'replace' : [ (0xA068, 0x10) ] },
++                    'lj-x86_64.so' : { 'md5': '28e1b2cde011cbbcd4b5c85c1866c893',
++                                       # https://bugs.launchpad.net/hplip/+bug/666780
++                                       'replace' : [ (0xD0D0, 0x10) ] }
++                  }
 +        if f in patches:
 +            d = open(f, 'rb').read()
 +            m = md5()
@@ -43,7 +45,7 @@
  
  def copyPluginFiles(src_dir):
      os.chdir(src_dir)
-@@ -411,6 +437,11 @@
+@@ -411,6 +440,11 @@
              continue
  
          else:

================================================================
Index: packages/hplip/hplip.spec
diff -u packages/hplip/hplip.spec:1.92 packages/hplip/hplip.spec:1.93
--- packages/hplip/hplip.spec:1.92	Wed Nov 30 19:09:28 2011
+++ packages/hplip/hplip.spec	Wed Nov 30 20:07:40 2011
@@ -12,7 +12,7 @@
 Summary(pl.UTF-8):	Narzędzia Hewlett-Packard Linux Imaging and Printing - drukowanie i skanowanie przy użyciu urządzeń HP
 Name:		hplip
 Version:	3.11.10
-Release:	1.2
+Release:	2
 License:	BSD (hpijs), MIT (low-level scanning and printing code), GPL v2 (the rest)
 Group:		Applications/System
 Source0:	http://downloads.sourceforge.net/hplip/%{name}-%{version}.tar.gz
@@ -378,6 +378,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.93  2011/11/30 19:07:40  arekm
+- rel 2; patch binary plugin for 64bit, too
+
 Revision 1.92  2011/11/30 18:09:28  arekm
 - patch binary plugin to fix https://bugs.launchpad.net/hplip/+bug/666780 (32bit only fix for now)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hplip/hplip-binary-fixup.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hplip/hplip.spec?r1=1.92&r2=1.93&f=u