Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory vz-cvs-3.sog:/tmp/cvs-serv19745
Modified Files:
pil-systempython.info
Log Message:
New varianting: Require /usr/bin/python2X for building, X=5,6,7, available on
OSX 10.X or later.
The result can then be used with either system python or any Fink python
2.5-2.7.
Don't set PYTHONPATH any more. User has to do this now. The asymptote package
does it inside the xasy script.
Index: pil-systempython.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/pil-systempython.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pil-systempython.info 10 Feb 2012 10:29:49 -0000 1.2
+++ pil-systempython.info 28 Apr 2012 11:50:42 -0000 1.3
@@ -1,9 +1,9 @@
Info2: <<
Package: pil-systempython%type_pkg[python]
Type: python (2.5 2.6 2.7)
-Distribution: (%type_pkg[python] = 25) 10.5, (%type_pkg[python] = 26) 10.6,
(%type_pkg[python] = 27) 10.7
+Distribution: (%type_pkg[python] = 26) 10.6, (%type_pkg[python] = 26) 10.7,
(%type_pkg[python] = 27) 10.7
Version: 1.1.7
-Revision: 3
+Revision: 5
Description: Python Imaging Library
DescDetail: <<
The Python Imaging Library (PIL) adds image processing capabilities to
@@ -12,11 +12,11 @@
<<
Source: http://effbot.org/downloads/Imaging-%v.tar.gz
Source-MD5: fc14a54e1ce02a0225be8854bfba478e
-BuildDepends: libpng15, libjpeg8, freetype219, fink (>=0.30)
-Depends: libpng15-shlibs, libjpeg8-shlibs, freetype219-shlibs
+BuildDepends: lcms, libpng15, libjpeg8, freetype219, fink (>=0.30)
+Depends: lcms-shlibs, libpng15-shlibs, libjpeg8-shlibs, freetype219-shlibs
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
-Replaces: pil
+Replaces: pil, pil-systempython25, pil-systempython26, pil-systempython27
Provides: pil
PatchFile: %{ni}.patch
PatchFile-MD5: d4940dfb66a0168b61eb0c33dea352e5
@@ -24,50 +24,35 @@
sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
<<
CompileScript: <<
- ARCHFLAGS=" " /usr/bin/python setup.py build
+ ARCHFLAGS=" " /usr/bin/python%type_raw[python] setup.py build
<<
InstallScript: <<
#!/bin/sh -ev
- /usr/bin/python setup.py install --prefix=%p --root=%d
--install-purelib=%p/Library/Python/%type_raw[python]/site-packages
--install-platlib=%p/Library/Python/%type_raw[python]/site-packages
+ /usr/bin/python%type_raw[python] setup.py install --prefix=%p --root=%d
--install-purelib=%p/Library/Python/%type_raw[python]/site-packages
--install-platlib=%p/Library/Python/%type_raw[python]/site-packages
mkdir -p %i/share/doc/%n
cp -R Docs/ %i/share/doc/%n/html
cp -R Scripts %i/share/doc/%n
mkdir -p
%i/Library/Python/%type_raw[python]/include/python%type_raw[python]/PIL
cp -f libImaging/ImPlatform.h libImaging/Imaging.h
%i/Library/Python/%type_raw[python]/include/python%type_raw[python]/PIL
- /usr/bin/install -d %i/etc/profile.d
- cat >%i/etc/profile.d/%n.sh <<-"EOF"
- if [ -z "$PYTHONPATH" ]; then
- PYTHONPATH="%p/Library/Python/%type_raw[python]/site-packages"
- else
- prepend_path PYTHONPATH
"%p/Library/Python/%type_raw[python]/site-packages"
- fi
- export PYTHONPATH
-EOF
- cat >%i/etc/profile.d/%n.csh <<-"EOF"
- if ( $?PYTHONPATH ) then
- prepend_path PYTHONPATH
"%p/Library/Python/%type_raw[python]/site-packages"
- else
- setenv PYTHONPATH "%p/Library/Python/%type_raw[python]/site-packages"
- endif
-EOF
- chmod 755 %i/etc/profile.d/%n.*
<<
InfoTest: <<
- TestScript: <<
- #!/bin/bash -ev
+ TestScript: <<
+ #!/bin/bash -ev
export PYTHONPATH=`ls -d %b/build/lib*`
-
- /usr/bin/python selftest.py || exit 2
- <<
+ /usr/bin/python selftest.py || exit 2
+ <<
<<
DocFiles: CHANGES BUILDME CONTENTS README
DescUsage: <<
- The package sets the runtime environment variable PYTHONPATH to
- %p/Library/Python/%type_raw[python]/site-packages, so that /usr/bin/python
- will find PIL modules with commands like
+ If you want to load PIL modules with commands like
from PIL import Image
+ you have to set the environment variable PYTHONPATH
+ (or from inside python, the variable sys.path[1]) to
+
+ %p/Library/Python/%type_raw[python]/site-packages
+
If, however, you want to run a script that uses only
import Image
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
