rpms/python-imaging/EL-5 Makefile, 1.3, 1.4 branch, 1.2, 1.3 python-imaging-giftrans.patch, 1.4, 1.5 python-imaging-lib64.patch, 1.2, 1.3 python-imaging-no-xv.patch, 1.2, 1.3 python-imaging.spec, 1.14, 1.15 sources, 1.5, 1.6 .cvsignore, 1.4, 1.5
Joel Andres Granados Moreno (jgranado)
fedora-extras-commits at redhat.com
Tue Jul 24 16:44:21 UTC 2007
Author: jgranado
Update of /cvs/pkgs/rpms/python-imaging/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6536
Modified Files:
.cvsignore
Added Files:
Makefile branch python-imaging-giftrans.patch
python-imaging-lib64.patch python-imaging-no-xv.patch
python-imaging.spec sources
Log Message:
Activating el5 Branch for missing python-imaging in pcc arch.
Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Makefile 24 Jul 2007 16:43:40 -0000 1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: python-imaging
+# $Id$
+NAME := python-imaging
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)
Index: branch
===================================================================
RCS file: branch
diff -N branch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ branch 24 Jul 2007 16:43:40 -0000 1.3
@@ -0,0 +1 @@
+EL-5
python-imaging-giftrans.patch:
Index: python-imaging-giftrans.patch
===================================================================
RCS file: python-imaging-giftrans.patch
diff -N python-imaging-giftrans.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ python-imaging-giftrans.patch 24 Jul 2007 16:43:40 -0000 1.5
@@ -0,0 +1,17 @@
+See http://bugs.debian.org/159693
+
+diff -Naru Imaging-1.1.4.orig/PIL/GifImagePlugin.py Imaging-1.1.4/PIL/GifImagePlugin.py
+--- Imaging-1.1.4.orig/PIL/GifImagePlugin.py 2003-05-06 23:44:16.000000000 +0300
++++ Imaging-1.1.4/PIL/GifImagePlugin.py 2004-10-09 21:12:12.635957206 +0300
+@@ -346,6 +346,11 @@
+ for i in range(maxcolor):
+ s.append(chr(i) * 3)
+
++ if im.info.has_key('transparency'):
++ transparentIndex = im.info['transparency']
++ s.append('!' + chr(0xf9) + chr(4) + chr(1) + chr(0) + chr(0) +
++ chr(transparentIndex) + chr(0))
++
+ return s
+
+ def getdata(im, offset = (0, 0), **params):
python-imaging-lib64.patch:
Index: python-imaging-lib64.patch
===================================================================
RCS file: python-imaging-lib64.patch
diff -N python-imaging-lib64.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ python-imaging-lib64.patch 24 Jul 2007 16:43:40 -0000 1.3
@@ -0,0 +1,10 @@
+--- setup-old.py 2005-03-23 18:16:40.000000000 +0000
++++ setup.py 2006-04-02 22:34:04.000000000 +0100
+@@ -180,6 +180,7 @@
+ add_directory(library_dirs, "/usr/local/lib")
+ add_directory(include_dirs, "/usr/local/include")
+
++ add_directory(library_dirs, "/usr/lib64")
+ add_directory(library_dirs, "/usr/lib")
+ add_directory(include_dirs, "/usr/include")
+
python-imaging-no-xv.patch:
Index: python-imaging-no-xv.patch
===================================================================
RCS file: python-imaging-no-xv.patch
diff -N python-imaging-no-xv.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ python-imaging-no-xv.patch 24 Jul 2007 16:43:40 -0000 1.3
@@ -0,0 +1,14 @@
+diff -Naru Imaging-1.1.4.orig/PIL/Image.py Imaging-1.1.4/PIL/Image.py
+--- Imaging-1.1.4.orig/PIL/Image.py 2003-05-08 23:48:47.000000000 +0300
++++ Imaging-1.1.4/PIL/Image.py 2004-10-09 21:11:16.547285512 +0300
+@@ -1722,9 +1722,7 @@
+ else:
+ format = None
+ if not command:
+- command = "xv"
+- if title:
+- command = command + " -name \"%s\"" % title
++ command = "eog"
+
+ if self.mode == "I;16":
+ # @PIL88 @PIL101
Index: python-imaging.spec
===================================================================
RCS file: python-imaging.spec
diff -N python-imaging.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ python-imaging.spec 24 Jul 2007 16:43:40 -0000 1.15
@@ -0,0 +1,225 @@
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%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.5
+Release: 1%{?dist}
+
+License: Distributable
+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)
+ExclusiveArch:ppc
+
+BuildRequires: python-devel, libjpeg-devel, zlib-devel, freetype-devel
+BuildRequires: tkinter, tk-devel
+
+Requires: python-abi = %{pyver}
+Requires: libjpeg
+Requires: zlib
+Requires: freetype
+Requires: tkinter
+
+%description
+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
+internal representation, and powerful image processing capabilities.
+
+Details about licensing can be found from README file.
+
+%package devel
+Summary: Development files for python-imaging.
+Group: Development/Languages
+Requires: %{name} = %{version}-%{release}, python-devel
+Requires: libjpeg-devel
+Requires: zlib-devel
+
+%description devel
+Development files for python-imaging.
+
+
+%prep
+%setup -q -n Imaging-%{version}
+%patch0 -p1
+%patch1 -p0
+%patch2 -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
+
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/%{py_incdir}/Imaging
+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-115
+%{python_sitearch}/PIL.pth
+%dir %{python_sitearch}/PIL
+%{python_sitearch}/PIL/*.so
+%{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
+
+
+%changelog
+* Tue Jul 24 2007 Joel Granados <jgranado at redhat dot com> - 1.1.5-1
+- Rebuild for ppc in EPEL.
+
+* 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 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.
+
+* Sat Oct 9 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.1.4-6
+- Borrow parts from patch in Debian's 1.1.4-3 to fix issues in bug 1038 as
+ well as a bunch of others.
+- Bring up to date with current fedora.us Python spec template recommendations.
+- Fix -devel directory permissions.
+
+* 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
+
+* Wed Jul 16 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.4-0.fdr.4
+- bumped release
+- implemented changes from Ville, which basically means that:
+- setup macro now users "-q" option
+- libpng dropped from buildrequirements
+- run test suite after build
+
+* 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
+ python 2.2.
+- removed percent signs from changelog.
+
+* Tue Jul 08 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.4-0.fdr.2
+- added XFree86-devel and tkinter into buildrequires.
+- removed version info from buildrequires
+- removed unnecessary stuff from requires.
+
+* Wed Jun 23 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.4-0.fdr.1
+- new upstream version
+
+* 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
+ version number.
+
+* Mon May 12 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.3-0.fdr.4
+- removed unnecessary ./configure
+- /usr/lib -> _libdir macro
+- smp flags to make
+
+* Sat May 03 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.3-0.fdr.3
+- changed buildroot macro back to $RP_BUILD_ROOT
+- ./configure to configure macro
+- Group to Development/Languages
+- Added Epoch values to versioned Requires and BuildRequires
+- added README and CHANGES-113 into doc
+
+* Wed Mar 26 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.3-0.fdr.2
+- added Epoch
+- added URL into Source0
+- replaced $RPM_BUILD_ROOT with buildroot macro
+
+* Wed Mar 26 2003 Juha Ylitalo <jylitalo at iki.fi> - 0:1.1.3-0.fdr.1
+- modified spec file to fit with fedora guidelines.
+
+* Mon Sep 23 2002 Juha Ylitalo <jylitalo at iki.fi> - 1.1.3-1
+- updated to 1.1.3
+- 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>
+- update to 1.1
+
+* Thu Mar 30 2000 Frederic Lepied <flepied at mandrakesoft.com> 1.0b1-3mdk
+- group fix.
+
+* Mon Jan 10 2000 Lenny Cartier <lenny at mandrakesoft.com>
+- build for oxygen
+- deactivate provinding of tkinter lib since Chmouel one's works perfectly
+
+* Mon Dec 27 1999 Lenny Cartier <lenny at mandrakesoft.com>
+- new in contribs
+- bz2 archive
+
+* Mon Jan 11 1999 Oliver Andrich <oli at andrich.net>
+- upgraded to Imaging 1.0b1
+
+* 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
+
+* Mon Jul 20 1998 Oliver Andrich <oli at andrich.net>
+- had to recompile and update the package to support the uptodate graphics
+ libs
+
+* Sat Jun 07 1998 Oliver Andrich <oli at andrich.net>
+- updated package to version 0.3a4
+
Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sources 24 Jul 2007 16:43:40 -0000 1.6
@@ -0,0 +1 @@
+a64512e39469213ced0d091b9eba76c0 Imaging-1.1.5.tar.gz
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-imaging/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 5 Feb 2007 19:53:48 -0000 1.4
+++ .cvsignore 24 Jul 2007 16:43:40 -0000 1.5
@@ -1 +1 @@
-Imaging-1.1.6.tar.gz
+Imaging-1.1.5.tar.gz
More information about the scm-commits
mailing list