packages: python-PIL/python-PIL-viewer.patch, python-PIL/python-PIL.spec - ...

[arekm]

Author: arekm                        Date: Mon Feb 15 22:54:30 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.1.7

---- Files affected:
packages/python-PIL:
   python-PIL-viewer.patch (1.1 -> 1.2) , python-PIL.spec (1.70 -> 1.71) 

---- Diffs:

================================================================
Index: packages/python-PIL/python-PIL-viewer.patch
diff -u packages/python-PIL/python-PIL-viewer.patch:1.1 packages/python-PIL/python-PIL-viewer.patch:1.2
--- packages/python-PIL/python-PIL-viewer.patch:1.1	Mon Nov 20 17:54:28 2006
+++ packages/python-PIL/python-PIL-viewer.patch	Mon Feb 15 23:54:25 2010
@@ -1,19 +1,29 @@
-diff -urN Imaging-1.1.5.org/PIL/Image.py Imaging-1.1.5/PIL/Image.py
---- Imaging-1.1.5.org/PIL/Image.py	2005-03-25 08:50:52.000000000 +0100
-+++ Imaging-1.1.5/PIL/Image.py	2006-11-20 17:50:14.000000000 +0100
-@@ -1896,9 +1896,12 @@
-     else:
-         format = None
-         if not command:
--            command = "xv"
+--- Imaging-1.1.7/PIL/ImageShow.py~	2009-11-01 01:44:12.000000000 +0100
++++ Imaging-1.1.7/PIL/ImageShow.py	2010-02-15 23:53:08.350589358 +0100
+@@ -147,12 +147,20 @@
+ 
+     class XVViewer(UnixViewer):
+         def get_command_ex(self, file, title=None, **options):
+-            # note: xv is pretty outdated.  most modern systems have
+-            # imagemagick's display command instead.
+-            command = executable = "xv"
 -            if title:
+-                # FIXME: do full escaping
 -                command = command + " -name \"%s\"" % title
-+            if os.path.exists("/usr/bin/kfmclient"):
-+                command = "/usr/bin/kfmclient exec";
++            if os.path.exists("/usr/bin/display"):
++                command = executable = "/usr/bin/display"
++                if title:
++                    command = command + " -title \"%s\"" % title
++            elif os.path.exists("/usr/bin/kfmclient"):
++                command = "/usr/bin/kfmclient exec"
++                executable = "/usr/bin/kfmclient"
 +            else:
-+                command = "xv"
++                # note: xv is pretty outdated.  most modern systems have
++                # imagemagick's display command instead.
++                command = executable = "xv"
 +                if title:
++                    # FIXME: do full escaping
 +                    command = command + " -name \"%s\"" % title
+             return command, executable
  
-     if image.mode == "I;16":
-         # @PIL88 @PIL101
+     if which("xv"):

================================================================
Index: packages/python-PIL/python-PIL.spec
diff -u packages/python-PIL/python-PIL.spec:1.70 packages/python-PIL/python-PIL.spec:1.71
--- packages/python-PIL/python-PIL.spec:1.70	Wed Feb 10 01:22:30 2010
+++ packages/python-PIL/python-PIL.spec	Mon Feb 15 23:54:25 2010
@@ -8,13 +8,13 @@
 Summary:	Python's own image processing library
 Summary(pl.UTF-8):	Biblioteka do przetwarzania obrazu w Pythonie
 Name:		python-%{module}
-Version:	1.1.6
-Release:	6
+Version:	1.1.7
+Release:	1
 Epoch:		1
 License:	distributable
 Group:		Libraries/Python
 Source0:	http://effbot.org/downloads/Imaging-%{version}.tar.gz
-# Source0-md5:	3a9b5c20ca52f0a9900512d2c7347622
+# Source0-md5:	fc14a54e1ce02a0225be8854bfba478e
 Patch0:		%{name}-lib64.patch
 Patch1:		%{name}-viewer.patch
 Patch2:		python-imaging-1.1.6-sane-types.patch
@@ -170,6 +170,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71  2010/02/15 22:54:25  arekm
+- up to 1.1.7
+
 Revision 1.70  2010/02/10 00:22:30  sparky
 - dropped unused BR: libpng-devel (png I/O seems to be built-in)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-PIL/python-PIL-viewer.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-PIL/python-PIL.spec?r1=1.70&r2=1.71&f=u