rpms/python-imaging/FC-4 .cvsignore, 1.2, 1.3 python-imaging.spec, 1.6, 1.7 sources, 1.2, 1.3 python-imaging-build.patch, 1.1, NONE python-imaging-ft2.patch, 1.1, NONE python-imaging-giftrans.patch, 1.1, NONE python-imaging-no-rexec.patch, 1.1, NONE python-imaging-olefileio.patch, 1.1, NONE python-imaging-png.patch, 1.1, NONE
José AbÃlio Oliveira Matos (jamatos)
fedora-extras-commits at redhat.com
Mon Mar 6 01:49:15 UTC 2006
- Previous message (by thread): rpms/python-imaging/devel .cvsignore, 1.2, 1.3 python-imaging.spec, 1.6, 1.7 sources, 1.2, 1.3 python-imaging-build.patch, 1.1, NONE python-imaging-ft2.patch, 1.1, NONE python-imaging-giftrans.patch, 1.1, NONE python-imaging-no-rexec.patch, 1.1, NONE python-imaging-olefileio.patch, 1.1, NONE python-imaging-png.patch, 1.1, NONE
- Next message (by thread): rpms/tinyfugue/FC-3 tinyfugue.spec,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jamatos
Update of /cvs/extras/rpms/python-imaging/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26444
Modified Files:
.cvsignore python-imaging.spec sources
Removed Files:
python-imaging-build.patch python-imaging-ft2.patch
python-imaging-giftrans.patch python-imaging-no-rexec.patch
python-imaging-olefileio.patch python-imaging-png.patch
Log Message:
* Sun Mar 5 2006 José Matos <jamatos at fc.up.pt> - 1.1.5-1
- Update to 1.1.5
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 05:15:21 -0000 1.2
+++ .cvsignore 6 Mar 2006 01:49:15 -0000 1.3
@@ -1 +1 @@
-Imaging-1.1.4.tar.gz
+Imaging-1.1.5.tar.gz
Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/FC-4/python-imaging.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-imaging.spec 23 May 2005 00:04:27 -0000 1.6
+++ python-imaging.spec 6 Mar 2006 01:49:15 -0000 1.7
@@ -4,24 +4,24 @@
Summary: Python's own image processing library
Name: python-imaging
-Version: 1.1.4
-Release: 9
+Version: 1.1.5
+Release: 1%{?dist}
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
+Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz
+Patch0: %{name}-no-xv.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
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+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
@@ -37,7 +37,9 @@
%package devel
Summary: Development files for python-imaging.
Group: Development/Languages
-Requires: %{name} = %{version}-%{release}, python-devel, %{py_incdir}
+Requires: %{name} = %{version}-%{release}, python-devel
+Requires: libjpeg-devel
+Requires: zlib-devel
%description devel
Development files for python-imaging.
@@ -46,25 +48,23 @@
%prep
%setup -q -n Imaging-%{version}
%patch0 -p1
-%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
-cd libImaging
-%configure
-make \
-%ifarch x86_64
- CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" \
-%endif
- %{?_smp_mflags}
+# Is this still relevant? (It was used in 1.1.4)
+#%ifarch x86_64
+# CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" \
+#%endif
-cd ..
-%{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
%install
@@ -73,6 +73,9 @@
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
@@ -84,7 +87,7 @@
%files
%defattr (-,root,root)
-%doc README CHANGES-114
+%doc README CHANGES-115
%{python_sitearch}/PIL.pth
%dir %{python_sitearch}/PIL
%{python_sitearch}/PIL/*.so
@@ -95,10 +98,13 @@
%files devel
%defattr (0644,root,root,755)
%{py_incdir}/Imaging
-%doc Doc Scripts Images Sane
+%doc Docs Scripts Images Sane
%changelog
+* 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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 05:15:21 -0000 1.2
+++ sources 6 Mar 2006 01:49:15 -0000 1.3
@@ -1 +1 @@
-d2c03c25a9a0128832137dd536da88da Imaging-1.1.4.tar.gz
+a64512e39469213ced0d091b9eba76c0 Imaging-1.1.5.tar.gz
--- python-imaging-build.patch DELETED ---
--- python-imaging-ft2.patch DELETED ---
--- python-imaging-giftrans.patch DELETED ---
--- python-imaging-no-rexec.patch DELETED ---
--- python-imaging-olefileio.patch DELETED ---
--- python-imaging-png.patch DELETED ---
- Previous message (by thread): rpms/python-imaging/devel .cvsignore, 1.2, 1.3 python-imaging.spec, 1.6, 1.7 sources, 1.2, 1.3 python-imaging-build.patch, 1.1, NONE python-imaging-ft2.patch, 1.1, NONE python-imaging-giftrans.patch, 1.1, NONE python-imaging-no-rexec.patch, 1.1, NONE python-imaging-olefileio.patch, 1.1, NONE python-imaging-png.patch, 1.1, NONE
- Next message (by thread): rpms/tinyfugue/FC-3 tinyfugue.spec,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list