rpms/python-imaging/devel .cvsignore, 1.4, 1.5 python-imaging-shebang.patch, 1.1, 1.2 python-imaging.spec, 1.31, 1.32 sources, 1.4, 1.5
Roman Rakus
rrakus at fedoraproject.org
Tue Jun 1 12:55:41 UTC 2010
Author: rrakus
Update of /cvs/pkgs/rpms/python-imaging/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26107
Modified Files:
.cvsignore python-imaging-shebang.patch python-imaging.spec
sources
Log Message:
Update to 1.1.7
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-imaging/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 5 Feb 2007 19:38:57 -0000 1.4
+++ .cvsignore 1 Jun 2010 12:55:40 -0000 1.5
@@ -1 +1 @@
-Imaging-1.1.6.tar.gz
+Imaging-1.1.7.tar.gz
python-imaging-shebang.patch:
Sane/demo_numarray.py | 2 +-
Sane/demo_pil.py | 2 +-
Scripts/pildriver.py | 2 +-
setup.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
Index: python-imaging-shebang.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-imaging/devel/python-imaging-shebang.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-imaging-shebang.patch 8 Sep 2009 14:38:34 -0000 1.1
+++ python-imaging-shebang.patch 1 Jun 2010 12:55:41 -0000 1.2
@@ -1,36 +1,36 @@
-diff -ru Imaging-1.1.6/Sane/demo_numarray.py Imaging-1.1.6-shebang/Sane/demo_numarray.py
---- Imaging-1.1.6/Sane/demo_numarray.py 2006-12-03 12:37:18.000000000 +0100
-+++ Imaging-1.1.6-shebang/Sane/demo_numarray.py 2009-09-08 16:15:36.000000000 +0200
+diff -up Imaging-1.1.7/Sane/demo_numarray.py.shebang Imaging-1.1.7/Sane/demo_numarray.py
+--- Imaging-1.1.7/Sane/demo_numarray.py.shebang 2009-11-01 01:44:12.000000000 +0100
++++ Imaging-1.1.7/Sane/demo_numarray.py 2010-05-27 12:43:49.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
#
# Shows how to scan a 16 bit grayscale image into a numarray object
-diff -ru Imaging-1.1.6/Sane/demo_pil.py Imaging-1.1.6-shebang/Sane/demo_pil.py
---- Imaging-1.1.6/Sane/demo_pil.py 2006-12-03 12:37:18.000000000 +0100
-+++ Imaging-1.1.6-shebang/Sane/demo_pil.py 2009-09-08 16:15:48.000000000 +0200
+diff -up Imaging-1.1.7/Sane/demo_pil.py.shebang Imaging-1.1.7/Sane/demo_pil.py
+--- Imaging-1.1.7/Sane/demo_pil.py.shebang 2009-11-01 01:44:12.000000000 +0100
++++ Imaging-1.1.7/Sane/demo_pil.py 2010-05-27 12:43:49.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
#
# Shows how to scan a color image into a PIL rgb-image
-diff -ru Imaging-1.1.6/Scripts/pildriver.py Imaging-1.1.6-shebang/Scripts/pildriver.py
---- Imaging-1.1.6/Scripts/pildriver.py 2006-12-03 12:37:18.000000000 +0100
-+++ Imaging-1.1.6-shebang/Scripts/pildriver.py 2009-09-08 16:15:58.000000000 +0200
+diff -up Imaging-1.1.7/Scripts/pildriver.py.shebang Imaging-1.1.7/Scripts/pildriver.py
+--- Imaging-1.1.7/Scripts/pildriver.py.shebang 2009-11-01 23:08:46.000000000 +0100
++++ Imaging-1.1.7/Scripts/pildriver.py 2010-05-27 12:43:49.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
"""PILdriver, an image-processing calculator using PIL.
An instance of class PILDriver is essentially a software stack machine
-diff -ru Imaging-1.1.6/setup.py Imaging-1.1.6-shebang/setup.py
---- Imaging-1.1.6/setup.py 2006-12-03 12:37:29.000000000 +0100
-+++ Imaging-1.1.6-shebang/setup.py 2009-09-08 16:16:10.000000000 +0200
+diff -up Imaging-1.1.7/setup.py.shebang Imaging-1.1.7/setup.py
+--- Imaging-1.1.7/setup.py.shebang 2010-05-27 12:43:49.000000000 +0200
++++ Imaging-1.1.7/setup.py 2010-05-27 12:44:27.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
#
# Setup script for PIL 1.1.5 and later
- # $Id$
+ #
Index: python-imaging.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-imaging/devel/python-imaging.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- python-imaging.spec 24 Feb 2010 09:18:58 -0000 1.31
+++ python-imaging.spec 1 Jun 2010 12:55:41 -0000 1.32
@@ -4,14 +4,13 @@
Summary: Python's own image processing library
Name: python-imaging
-Version: 1.1.6
-Release: 17%{?dist}
+Version: 1.1.7
+Release: 1%{?dist}
License: MIT
Group: System Environment/Libraries
Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz
-Patch0: %{name}-no-xv.patch
Patch1: %{name}-lib64.patch
Patch2: %{name}-giftrans.patch
Patch3: %{name}-1.1.6-sane-types.patch
@@ -20,7 +19,7 @@ URL: http://www.pythonware.com
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel, libjpeg-devel, zlib-devel, freetype-devel
-BuildRequires: tkinter, tk-devel
+BuildRequires: tkinter, tk-devel, lcms-devel
%ifnarch s390 s390x
BuildRequires: sane-backends-devel
%endif
@@ -72,7 +71,6 @@ This package contains a Tk interface for
%prep
%setup -q -n Imaging-%{version}
-%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1 -b .sane-types
@@ -138,7 +136,11 @@ popd
%check
-PYTHONPATH=$(ls -1d build/lib.linux*) %{__python} selftest.py
+# need some hacks
+sed -i "s|ROOT = \".\"|ROOT = \"$RPM_BUILD_ROOT%{python_sitearch}\"|" selftest.py
+ln -s $PWD/Images $RPM_BUILD_ROOT%{python_sitearch}/Images
+%{__python} selftest.py
+rm $RPM_BUILD_ROOT%{python_sitearch}/Images
%clean
rm -rf $RPM_BUILD_ROOT
@@ -169,6 +171,9 @@ rm -rf $RPM_BUILD_ROOT
%files tk -f files.tk
%changelog
+* Tue Jun 01 2010 Roman Rakus <rrakus at redhat.com> - 1.1.7-1
+- Update to 1.1.7
+
* Tue Sep 08 2009 Joel Granados <jgranado at redhat.com> - 1.1.6-17
- Fix the shebang issue. See https://fedoraproject.org/wiki/Features/SystemPythonExecutablesUseSystemPython
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-imaging/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 5 Feb 2007 19:38:57 -0000 1.4
+++ sources 1 Jun 2010 12:55:41 -0000 1.5
@@ -1 +1 @@
-3a9b5c20ca52f0a9900512d2c7347622 Imaging-1.1.6.tar.gz
+fc14a54e1ce02a0225be8854bfba478e Imaging-1.1.7.tar.gz
More information about the scm-commits
mailing list