rpms/python-imaging/EL-4 python-imaging-build.patch, 1.2, 1.3 python-imaging-ft2.patch, 1.2, 1.3 python-imaging-no-rexec.patch, 1.2, 1.3 python-imaging-olefileio.patch, 1.2, 1.3 python-imaging-png.patch, 1.2, 1.3 .cvsignore, 1.4, 1.5 python-imaging.spec, 1.15, 1.16 sources, 1.4, 1.5 python-imaging-lib64.patch, 1.1, NONE

Joel Andres Granados Moreno (jgranado) fedora-extras-commits at redhat.com
Mon Jul 23 14:59:26 UTC 2007


Author: jgranado

Update of /cvs/pkgs/rpms/python-imaging/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23525

Modified Files:
	.cvsignore python-imaging.spec sources 
Added Files:
	python-imaging-build.patch python-imaging-ft2.patch 
	python-imaging-no-rexec.patch python-imaging-olefileio.patch 
	python-imaging-png.patch 
Removed Files:
	python-imaging-lib64.patch 
Log Message:
Changing sources for python-imaging in EPEL4.  1.1.6 was replaced by 1.1.4
The source file and the patches are from the FC3 tree.


python-imaging-build.patch:

Index: python-imaging-build.patch
===================================================================
RCS file: python-imaging-build.patch
diff -N python-imaging-build.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ python-imaging-build.patch	23 Jul 2007 14:59:22 -0000	1.3
@@ -0,0 +1,15 @@
+diff -Naru Imaging-1.1.4.orig/libImaging/Makefile.in Imaging-1.1.4/libImaging/Makefile.in
+--- Imaging-1.1.4.orig/libImaging/Makefile.in	2003-04-22 19:11:26.000000000 +0300
++++ Imaging-1.1.4/libImaging/Makefile.in	2004-10-09 21:15:49.416221082 +0300
+@@ -30,10 +30,9 @@
+ # Other things that are customizable but not by configure
+ 
+ INCLDIR=	$(srcdir)/.
+-JPEGINCLUDE=	/usr/local/include
+ OPT=		@OPT@
+ #OPT=		-g
+-CFLAGS=		$(OPT) -I$(INCLDIR) -I$(JPEGINCLUDE) $(DEFS)
++CFLAGS=		$(RPM_OPT_FLAGS) -I. -I$(INCLDIR) $(DEFS)
+ 
+ MKDEP=		mkdep
+ SHELL=		/bin/sh

python-imaging-ft2.patch:

Index: python-imaging-ft2.patch
===================================================================
RCS file: python-imaging-ft2.patch
diff -N python-imaging-ft2.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ python-imaging-ft2.patch	23 Jul 2007 14:59:22 -0000	1.3
@@ -0,0 +1,13 @@
+diff -Naru Imaging-1.1.4.orig/_imagingft.c Imaging-1.1.4/_imagingft.c
+--- Imaging-1.1.4.orig/_imagingft.c	2003-04-22 19:11:25.000000000 +0300
++++ Imaging-1.1.4/_imagingft.c	2004-10-09 21:16:23.446131359 +0300
+@@ -15,7 +15,8 @@
+ #include "Python.h"
+ #include "Imaging.h"
+ 
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ 
+ #if PY_VERSION_HEX < 0x01060000
+ #define PyObject_DEL(op) PyMem_DEL((op))

python-imaging-no-rexec.patch:

Index: python-imaging-no-rexec.patch
===================================================================
RCS file: python-imaging-no-rexec.patch
diff -N python-imaging-no-rexec.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ python-imaging-no-rexec.patch	23 Jul 2007 14:59:22 -0000	1.3
@@ -0,0 +1,28 @@
+See http://bugs.debian.org/182149
+
+diff -Naru Imaging-1.1.4.orig/PIL/ArgImagePlugin.py Imaging-1.1.4/PIL/ArgImagePlugin.py
+--- Imaging-1.1.4.orig/PIL/ArgImagePlugin.py	2003-05-06 23:44:16.000000000 +0300
++++ Imaging-1.1.4/PIL/ArgImagePlugin.py	2004-10-09 21:13:08.083849091 +0300
+@@ -19,7 +19,7 @@
+ 
+ __version__ = "0.3"
+ 
+-import marshal, rexec, string
++import marshal, string
+ 
+ import Image, ImageFile, ImagePalette
+ 
+@@ -457,12 +457,10 @@
+ 
+     def __applet(self, code):
+ 
+-        if not APPLET_HOOK:
++        if 1: # not APPLET_HOOK:
+             return
+ 
+         # run script in safe environment
+-        safe = rexec.RExec()
+-        safe.r_exec(code)
+ 
+         # must convert images to Image object form
+         images = {}

python-imaging-olefileio.patch:

Index: python-imaging-olefileio.patch
===================================================================
RCS file: python-imaging-olefileio.patch
diff -N python-imaging-olefileio.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ python-imaging-olefileio.patch	23 Jul 2007 14:59:22 -0000	1.3
@@ -0,0 +1,14 @@
+See http://bugs.debian.org/197165
+
+diff -Naru Imaging-1.1.4.orig/PIL/OleFileIO.py Imaging-1.1.4/PIL/OleFileIO.py
+--- Imaging-1.1.4.orig/PIL/OleFileIO.py	2003-04-26 14:50:24.000000000 +0300
++++ Imaging-1.1.4/PIL/OleFileIO.py	2004-10-09 21:14:58.156932792 +0300
+@@ -295,7 +295,7 @@
+         fat = []
+         for i in range(0, len(sect), 4):
+             ix = i32(sect, i)
+-            if ix == 0xFFFFFFFEL or x == 0xFFFFFFFFL:
++            if ix == 0xFFFFFFFEL or ix == 0xFFFFFFFFL:
+                 break
+             s = self.getsect(ix)
+             fat = fat + map(lambda i, s=s: i32(s, i), range(0, len(s), 4))

python-imaging-png.patch:

Index: python-imaging-png.patch
===================================================================
RCS file: python-imaging-png.patch
diff -N python-imaging-png.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ python-imaging-png.patch	23 Jul 2007 14:59:22 -0000	1.3
@@ -0,0 +1,17 @@
+See http://bugs.debian.org/211712
+
+diff -Naru Imaging-1.1.4.orig/PIL/PngImagePlugin.py Imaging-1.1.4/PIL/PngImagePlugin.py
+--- Imaging-1.1.4.orig/PIL/PngImagePlugin.py	2003-05-06 23:44:17.000000000 +0300
++++ Imaging-1.1.4/PIL/PngImagePlugin.py	2004-10-09 21:14:03.843649797 +0300
+@@ -206,8 +206,9 @@
+ 
+         # text
+         s = self.fp.read(len)
+-        [k, v] = string.split(s, "\0")
+-        self.im_info[k] = v
++        if "\0" in s:
++            [k, v] = string.split(s, "\0", 1)
++            self.im_info[k] = v
+         return s
+ 
+ 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-imaging/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 Feb 2007 19:38:57 -0000	1.4
+++ .cvsignore	23 Jul 2007 14:59:22 -0000	1.5
@@ -1 +1 @@
-Imaging-1.1.6.tar.gz
+Imaging-1.1.4.tar.gz


Index: python-imaging.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-imaging/EL-4/python-imaging.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- python-imaging.spec	24 Feb 2007 02:15:36 -0000	1.15
+++ python-imaging.spec	23 Jul 2007 14:59:22 -0000	1.16
@@ -2,30 +2,31 @@
 %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")
 %define py_incdir %{_includedir}/python%{pyver}
 
-Summary:       Python's own image processing library
-Name:          python-imaging
-Version:       1.1.6
-Release:       3%{?dist}
-
-License:       BSD
-Group:         Development/Languages
-
-Source0:       http://effbot.org/downloads/Imaging-%{version}.tar.gz
-Patch0:        %{name}-no-xv.patch
-Patch1:        %{name}-lib64.patch
-Patch2:        %{name}-giftrans.patch
-URL:           http://www.pythonware.com/products/pil/
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: python-devel, libjpeg-devel, zlib-devel, freetype-devel
-BuildRequires: tkinter, tk-devel, tcl-devel
-
-Requires: tkinter
+Summary: Python's own image processing library 
+Name: python-imaging
+Epoch: 0
+Version: 1.1.4
+Release: 1
+License: Distributable
+Group: Development/Languages
+Source0: http://effbot.org/downloads/Imaging-1.1.4.tar.gz
+Patch0: %{name}-ft2.patch
+Patch1: %{name}-build.patch
+Patch2: %{name}-no-xv.patch
+Patch3: %{name}-olefileio.patch
+Patch4: %{name}-png.patch
+Patch5: %{name}-no-rexec.patch
+Patch6: %{name}-giftrans.patch
+URL: http://www.pythonware.com/products/pil/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: python-devel, libjpeg-devel, zlib-devel, XFree86-devel
+BuildRequires: tkinter, %{_includedir}/tcl.h, %{_includedir}/tk.h
+Requires: python-abi = %{pyver}
 
 %description
-Python Imaging Library
-
-The Python Imaging Library (PIL) adds image processing capabilities
+Python Imaging Library 
+   
+The Python Imaging Library (PIL) adds image processing capabilities 
 to your Python interpreter.
 
 This library provides extensive file format support, an efficient
@@ -36,37 +37,38 @@
 %package devel
 Summary: Development files for python-imaging.
 Group: Development/Languages
-Requires: %{name} = %{version}-%{release}, python-devel
-Requires: libjpeg-devel
-Requires: zlib-devel
+Requires: %{name} = %{epoch}:%{version}-%{release}, python-devel, %{py_incdir}
 
 %description devel
 Development files for python-imaging.
 
+#---------------------------------------------------------------------
 
 %prep
 %setup -q -n Imaging-%{version}
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
-# fix the interpreter path for Scripts/*.py
-cd Scripts
-for scr in *.py
-do
-  sed -e "s|/usr/local/bin/python|%{_bindir}/python|"  $scr > tmp.py
-  mv tmp.py $scr
-  chmod 755 $scr
-done
+#---------------------------------------------------------------------
 
 %build
-# Is this still relevant? (It was used in 1.1.4)
-#%ifarch x86_64
-#   CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" \
-#%endif
+cd libImaging
+%configure
+make \
+%ifarch x86_64
+   CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" \
+%endif
+   %{?_smp_mflags}
 
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+cd ..
+%{__python} setup.py build
 
+#---------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -74,70 +76,37 @@
 install -m 644 libImaging/*.h $RPM_BUILD_ROOT/%{py_incdir}/Imaging
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-# There is no need to ship the binaries since they are already packaged
-# in %doc
-rm -rf $RPM_BUILD_ROOT%{_bindir}
+#---------------------------------------------------------------------
 
 %check || :
 PYTHONPATH=$(ls -1d build/lib.linux*) %{__python} selftest.py
 
+#---------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+#---------------------------------------------------------------------
 
 %files
 %defattr (-,root,root)
-%doc README CHANGES
+%doc README CHANGES-114
 %{python_sitearch}/PIL.pth
 %dir %{python_sitearch}/PIL
 %{python_sitearch}/PIL/*.so
-%{python_sitearch}/PIL/*.py*
+%{python_sitearch}/PIL/*.py
+%{python_sitearch}/PIL/*.pyc
+%ghost %{python_sitearch}/PIL/*.pyo
 
 %files devel
 %defattr (0644,root,root,755)
 %{py_incdir}/Imaging
-%doc Docs Scripts Images Sane
-
+%doc Doc Scripts Images Sane
 
 %changelog
-* Fri Feb 23 2007 Mike McGrath <mmcgrath at redhat.com> - 1.1.6-3
-- Added buildrequires for tcl-devel (tk-devel does not pull in for RHEL4)
-
-* Wed Feb 14 2007 José Matos <jamatos[AT]fc.up.pt> - 1.1.6-2
-- Rebuild for Tcl/Tk downgrade (F7)
-
-* Mon Feb  5 2007 José Matos <jamatos[AT]fc.up.pt> - 1.1.6-1
-- New upstream version.
-- Clean spec file and specify license as BSD.
-
-* Tue Dec 12 2006 José Matos <jamatos[AT]fc.up.pt> - 1.1.5-7
-- Rebuild for python 2.5.
-
-* Tue Aug 29 2006 José Matos <jamatos[AT]fc.up.pt> - 1.1.5-6
-- Rebuild for FE6
-- Clean package, no need for python-abi requirement and ghost pyo files
-
-* Thu Apr  6 2006 José Matos <jamatos[AT]fc.up.pt> - 1.1.5-5
-- Rebuild because of #187739
-
-* Tue Apr  4 2006 José Matos <jamatos[AT]fc.up.pt> - 1.1.5-4
-- Rebuild
-
-* Tue Apr  4 2006 José Matos <jamatos[AT]fc.up.pt> - 1.1.5-3
-- Restore gif transparency patch. (bug #187875)
-
-* Sun Apr  2 2006 José Matos <jamatos[AT]fc.up.pt> - 1.1.5-2
-- Fix bug #185203 (Thanks to Rick L Vinyard Jr)
-
-* Sun Mar  5 2006 José Matos <jamatos[AT]fc.up.pt> - 1.1.5-1
-- Update to 1.1.5
-
-* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.1.4-9
-- rebuild on all arches
-
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
+* Mon Jul 23 2007 Joel Andres Granados <jgranado at redhat dot com> - 0:1.1.4-1
+- Build python-imaging for EPEL4 with the version from FC3.  EPEL4 are packages
+- that can be installed in RHEL4**.
 
 * Mon Feb  7 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.1.4-7
 - Build PIC on x86_64 to fix x86_64 linking.
@@ -150,7 +119,7 @@
 
 * Sun Nov 30 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.4-0.fdr.5
 - added -devel package (thanks to patch from pmatilai at welho.com)
-- FC1 requires dependency to tcl-devel and tk-devel package
+- FC1 requires dependency to tcl-devel and tk-devel package 
 
 * Wed Jul 16 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.4-0.fdr.4
 - bumped release
@@ -161,7 +130,7 @@
 
 * Sat Jul 12 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.4-0.fdr.3
 - fixed source0 to point into effbot.org instead of pythonware.com
-- changed references from python2 to python, since python in RH9 is
+- changed references from python2 to python, since python in RH9 is 
   python 2.2.
 - removed percent signs from changelog.
 
@@ -175,7 +144,7 @@
 
 * Tue May 20 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.3-0.fdr.5
 - added python2-devel into buildrequires.
-- added versionm variable into setup macro instead of hard coded
+- added versionm variable into setup macro instead of hard coded 
   version number.
 
 * Mon May 12 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.3-0.fdr.4
@@ -203,7 +172,7 @@
 - switched from python 1.5.2 to python 2.2
 - other modifications to make it build at minimal effort
 
-* Tue Sep 12 2000 Ray Garcia <rayg at ssec.wisc.edu>
+* Tue Sep 12 2000 Ray Garcia <rayg at ssec.wisc.edu> 
 - update to 1.1
 
 * Thu Mar 30 2000 Frederic Lepied <flepied at mandrakesoft.com> 1.0b1-3mdk
@@ -222,11 +191,11 @@
 
 * Sun Dec 27 1998 Oliver Andrich <oli at andrich.net>
 - changed Setup file so that the tkinter module is compiled with Tix and BLT
-  support
+	support
 
 * Mon Jul 20 1998 Oliver Andrich <oli at andrich.net>
 - had to recompile and update the package to support the uptodate graphics
-  libs
+	libs
 
 * Sat Jun 07 1998 Oliver Andrich <oli at andrich.net>
 - updated package to version 0.3a4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-imaging/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 Feb 2007 19:38:57 -0000	1.4
+++ sources	23 Jul 2007 14:59:22 -0000	1.5
@@ -1 +1 @@
-3a9b5c20ca52f0a9900512d2c7347622  Imaging-1.1.6.tar.gz
+d2c03c25a9a0128832137dd536da88da  Imaging-1.1.4.tar.gz


--- python-imaging-lib64.patch DELETED ---




More information about the fedora-extras-commits mailing list