packages: python-PIL/python-PIL.spec - add sane types and giftrans patches ...

[glen]

Author: glen                         Date: Sun Feb  7 14:45:47 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add sane types and giftrans patches from fc, tk bconds fixed

---- Files affected:
packages/python-PIL:
   python-PIL.spec (1.68 -> 1.69) 

---- Diffs:

================================================================
Index: packages/python-PIL/python-PIL.spec
diff -u packages/python-PIL/python-PIL.spec:1.68 packages/python-PIL/python-PIL.spec:1.69
--- packages/python-PIL/python-PIL.spec:1.68	Sun Feb  7 15:41:11 2010
+++ packages/python-PIL/python-PIL.spec	Sun Feb  7 15:45:42 2010
@@ -17,6 +17,8 @@
 # Source0-md5:	3a9b5c20ca52f0a9900512d2c7347622
 Patch0:		%{name}-lib64.patch
 Patch1:		%{name}-viewer.patch
+Patch2:		python-imaging-1.1.6-sane-types.patch
+Patch3:		python-imaging-giftrans.patch
 URL:		http://www.pythonware.com/products/pil/
 BuildRequires:	libjpeg-devel >= 6a
 BuildRequires:	libpng-devel >= 1.0.8
@@ -84,6 +86,8 @@
 %patch0 -p1
 %endif
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 # fix the interpreter path for Scripts/*.py
 sed -i -e "s|/usr/local/bin/python|%{_bindir}/python|" Scripts/*.py
@@ -134,10 +138,11 @@
 
 %{_examplesdir}/%{name}-%{version}
 
-# -tk
+%if %{with tk}
 %exclude %{py_sitedir}/%{module}/ImageTk.py[co]
 %exclude %{py_sitedir}/%{module}/SpiderImagePlugin.py[co]
 %exclude %{py_sitedir}/%{module}/_imagingtk.so
+%endif
 
 %files sane
 %defattr(644,root,root,755)
@@ -148,11 +153,13 @@
 %{py_sitedir}/pysane-*.egg-info
 %endif
 
+%if %{with tk}
 %files tk
 %defattr(644,root,root,755)
 %{py_sitedir}/%{module}/ImageTk.py[co]
 %{py_sitedir}/%{module}/SpiderImagePlugin.py[co]
 %attr(755,root,root) %{py_sitedir}/%{module}/_imagingtk.so
+%endif
 
 %files devel
 %defattr(644,root,root,755)
@@ -164,6 +171,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.69  2010/02/07 14:45:42  glen
+- add sane types and giftrans patches from fc, tk bconds fixed
+
 Revision 1.68  2010/02/07 14:41:11  glen
 - separate -tk, build -sane; rel 6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-PIL/python-PIL.spec?r1=1.68&r2=1.69&f=u