SPECS: python-Imaging.spec - updated to 1.1.5 - renamed to python-...

[troll]

Author: troll                        Date: Sun Apr  9 19:10:47 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.1.5
- renamed to python-PIL
- removed old patches
- added lib64 patch fixing library path searches on 64 bit archs
- included userspace tools requiring the module
- Epoch 1

---- Files affected:
SPECS:
   python-Imaging.spec (1.53 -> 1.54) 

---- Diffs:

================================================================
Index: SPECS/python-Imaging.spec
diff -u SPECS/python-Imaging.spec:1.53 SPECS/python-Imaging.spec:1.54
--- SPECS/python-Imaging.spec:1.53	Sat Mar 12 13:32:37 2005
+++ SPECS/python-Imaging.spec	Sun Apr  9 21:10:42 2006
@@ -3,21 +3,20 @@
 # Conditional build:
 %bcond_without	tk	# build without tkinter support
 #
-%define		module	Imaging
+%define		module	PIL
 
 Summary:	Python's own image processing library
 Summary(pl):	Biblioteka do przetwarzania obrazu w Pythonie
 Name:		python-%{module}
-Version:	1.1.5a3
-Release:	3
+Version:	1.1.5
+Release:	1
+Epoch:		1
 License:	distributable
 Group:		Libraries/Python
-Source0:	http://effbot.org/downloads/%{module}-%{version}.tar.gz
-# Source0-md5:	6c004e0232e5a2ac2468467793dcadbb
-Patch0:		Imaging-libver.patch
-Patch1:		%{name}-EXTRA_ARGS.patch
-Patch2:		%{name}-freetype.patch
+Source0:	http://effbot.org/downloads/Imaging-%{version}.tar.gz
+# Source0-md5:	a64512e39469213ced0d091b9eba76c0
 URL:		http://www.pythonware.com/products/pil/index.htm
+Patch0:		%{name}-lib64.patch
 BuildRequires:	libjpeg-devel >= 6a
 BuildRequires:	libpng-devel >= 1.0.8
 BuildRequires:	python
@@ -26,6 +25,7 @@
 %{?with_tk:BuildRequires:	python-tkinter}
 BuildRequires:	zlib-devel
 %pyrequires_eq	python-libs
+Obsoletes:	python-Imaging
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -44,6 +44,7 @@
 Summary(pl):	Pliki nagłówkowe do biblioteki obróbki obrazu w Pythonie
 Group:		Development/Languages/Python
 %pyrequires_eq	python
+Obsoletes:	python-Imaging-devel
 Requires:	%{name} = %{version}-%{release}
 
 %description devel
@@ -53,33 +54,27 @@
 Pliki nagłówkowe do biblioteki obróbki obrazu w Pythonie.
 
 %prep
-%setup -q -n %{module}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%setup -q -n Imaging-%{version}
+
+%if %{_lib} == "lib64"
+%patch0 -p1 
+%endif
 
 %build
-cd libImaging
-%configure2_13
-%{__make} \
-	OPT="%{rpmcflags} -fPIC"
-cd ..
-#%%{__make} -f Makefile.pre.in boot
-#%%{__make}
 python setup.py build_ext -i
+python selftest.py
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{py_sitedir}/%{module},%{py_incdir}}
 
-echo %{module} > $RPM_BUILD_ROOT%{py_sitedir}/%{module}.pth
-# install *.so $RPM_BUILD_ROOT%{py_sitedir}/%{module}
-install PIL/* $RPM_BUILD_ROOT%{py_sitedir}/%{module}
-install libImaging/Im{Config,Platform,aging}.h $RPM_BUILD_ROOT%{py_incdir}
-
-ln -sf %{module} $RPM_BUILD_ROOT%{py_sitedir}/PIL
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
+python setup.py install --root=$RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT%{py_incdir}
+install libImaging/Im{Platform,aging}.h $RPM_BUILD_ROOT%{py_incdir}
+
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}/%{module}
+
+rm -f $RPM_BUILD_ROOT%{py_sitedir}/%{module}/*.py
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -87,13 +82,10 @@
 %files
 %defattr(644,root,root,755)
 %doc README CHANGES*
+%attr(755,root,root) %{_bindir}/*
+%{py_sitedir}/PIL.pth
 %dir %{py_sitedir}/%{module}
-%{py_sitedir}/PIL
-%{py_sitedir}/%{module}.pth
-
-%attr(755,root,root) %{py_sitedir}/%{module}/_imaging.so
-%attr(755,root,root) %{py_sitedir}/%{module}/_imagingft.so
-%{?with_tk:%attr(755,root,root) %{py_sitedir}/%{module}/_imagingtk.so}
+%attr(755,root,root) %{py_sitedir}/%{module}/*.so
 %{py_sitedir}/%{module}/*.py?
 
 %files devel
@@ -106,6 +98,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2006/04/09 19:10:42  troll
+- updated to 1.1.5
+- renamed to python-PIL
+- removed old patches
+- added lib64 patch fixing library path searches on 64 bit archs
+- included userspace tools requiring the module
+- Epoch 1
+
 Revision 1.53  2005/03/12 12:32:37  troll
 - mass commit: remove obsolete BR: rpm-pythonprov
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/python-Imaging.spec?r1=1.53&r2=1.54&f=u