packages: python-PIL/python-PIL.spec - separate -tk, build -sane; rel 6

glen glen at pld-linux.org
Sun Feb 7 15:41:16 CET 2010


Author: glen                         Date: Sun Feb  7 14:41:16 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- separate -tk, build -sane; rel 6

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

---- Diffs:

================================================================
Index: packages/python-PIL/python-PIL.spec
diff -u packages/python-PIL/python-PIL.spec:1.67 packages/python-PIL/python-PIL.spec:1.68
--- packages/python-PIL/python-PIL.spec:1.67	Thu Jan 28 14:26:27 2010
+++ packages/python-PIL/python-PIL.spec	Sun Feb  7 15:41:11 2010
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	Biblioteka do przetwarzania obrazu w Pythonie
 Name:		python-%{module}
 Version:	1.1.6
-Release:	5
+Release:	6
 Epoch:		1
 License:	distributable
 Group:		Libraries/Python
@@ -17,13 +17,14 @@
 # Source0-md5:	3a9b5c20ca52f0a9900512d2c7347622
 Patch0:		%{name}-lib64.patch
 Patch1:		%{name}-viewer.patch
-URL:		http://www.pythonware.com/products/pil/index.htm
+URL:		http://www.pythonware.com/products/pil/
 BuildRequires:	libjpeg-devel >= 6a
 BuildRequires:	libpng-devel >= 1.0.8
 BuildRequires:	python
 BuildRequires:	python-devel >= 1:2.5
 %{?with_tk:BuildRequires:	python-tkinter}
 BuildRequires:	rpm-pythonprov
+BuildRequires:	sane-backends-devel
 %{?with_tk:BuildRequires:	tk-devel}
 BuildRequires:	zlib-devel
 %pyrequires_eq	python-libs
@@ -41,12 +42,34 @@
 interpretera Pythona. Biblioteka daje wsparcie dla wielu formatów
 plików, wydajną reprezentację wewnętrzną i duże możliwości obróbki
 
+%package sane
+Summary:	Python Module for using scanners
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description sane
+This package contains the sane module for Python which provides access
+to various raster scanning devices such as flatbed scanners and
+digital cameras.
+
+%package tk
+Summary:	Tk interface for python-imaging
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	python-tkinter
+Conflicts:	%{name} < 1:1.1.6-6
+
+%description tk
+This package contains a Tk interface for python-imaging.
+
 %package devel
 Summary:	Python's own image processing library header files
 Summary(pl.UTF-8):	Pliki nagłówkowe do biblioteki obróbki obrazu w Pythonie
 Group:		Development/Languages/Python
-%pyrequires_eq	python
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	libjpeg-devel
+Requires:	python-devel
+Requires:	zlib-devel
 Obsoletes:	python-Imaging-devel
 
 %description devel
@@ -62,21 +85,38 @@
 %endif
 %patch1 -p1
 
+# fix the interpreter path for Scripts/*.py
+sed -i -e "s|/usr/local/bin/python|%{_bindir}/python|" Scripts/*.py
+
 %build
-python setup.py build_ext -i
-python selftest.py
+export CFLAGS="%{rpmcflags}"
+%{__python} setup.py build_ext -i
+%{__python} selftest.py
+
+cd Sane
+%{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-python setup.py install --root=$RPM_BUILD_ROOT
+%{__python} setup.py install \
+	--optimize=2 \
+	--root=$RPM_BUILD_ROOT
+
+cd Sane
+%{__python} setup.py install \
+	--optimize=2 \
+	--root=$RPM_BUILD_ROOT
+cd ..
 
 install -d $RPM_BUILD_ROOT%{py_incdir}
-install libImaging/Im{Platform,aging}.h $RPM_BUILD_ROOT%{py_incdir}
+cp -a libImaging/Im{Platform,aging}.h $RPM_BUILD_ROOT%{py_incdir}
+
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+mv $RPM_BUILD_ROOT{%{_bindir}/pil*.py,%{_examplesdir}/%{name}-%{version}}
 
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}/%{module}
 
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/%{module}/*.py
+%py_postclean
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -84,12 +124,35 @@
 %files
 %defattr(644,root,root,755)
 %doc README CHANGES*
-%attr(755,root,root) %{_bindir}/*
-%{py_sitedir}/PIL.pth
+%{py_sitedir}/%{module}.pth
 %dir %{py_sitedir}/%{module}
+%{py_sitedir}/%{module}/*.py[co]
 %attr(755,root,root) %{py_sitedir}/%{module}/*.so
-%{py_sitedir}/%{module}/*.py?
-%{py_sitedir}/%{module}/*.egg-info
+%if "%{py_ver}" > "2.4"
+%{py_sitedir}/%{module}/%{module}-*.egg-info
+%endif
+
+%{_examplesdir}/%{name}-%{version}
+
+# -tk
+%exclude %{py_sitedir}/%{module}/ImageTk.py[co]
+%exclude %{py_sitedir}/%{module}/SpiderImagePlugin.py[co]
+%exclude %{py_sitedir}/%{module}/_imagingtk.so
+
+%files sane
+%defattr(644,root,root,755)
+%doc Sane/CHANGES Sane/demo*.py Sane/sanedoc.txt
+%{py_sitedir}/sane.py[co]
+%attr(755,root,root) %{py_sitedir}/_sane.so
+%if "%{py_ver}" > "2.4"
+%{py_sitedir}/pysane-*.egg-info
+%endif
+
+%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
 
 %files devel
 %defattr(644,root,root,755)
@@ -101,6 +164,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.68  2010/02/07 14:41:11  glen
+- separate -tk, build -sane; rel 6
+
 Revision 1.67  2010/01/28 13:26:27  sparky
 - BR: rpm-pythonprov
 
@@ -164,7 +230,7 @@
 - release 2 for rebuild with python 2.4
 
 Revision 1.49  2004/07/28 08:03:16  troll
-- removed %%include /usr/lib/rpm/macros.python
+- removed %include /usr/lib/rpm/macros.python
 
 Revision 1.48  2004/06/07 21:06:52  zboczuch
 - updated to 1.1.5a3
@@ -212,7 +278,7 @@
 - massive attack s/pld.org.pl/pld-linux.org/
 
 Revision 1.33  2002/11/29 22:46:08  ankry
-- massive attack: new %%doc
+- massive attack: new %doc
 
 Revision 1.32  2002/04/13 17:42:04  kloczek
 - rebuild against python 2.2.1.
@@ -247,7 +313,7 @@
 - release 4: rebuild against python 2.2.
 
 Revision 1.23  2002/01/18 02:14:43  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.22  2001/11/12 15:52:55  kloczek
 - release 3.
@@ -278,7 +344,7 @@
 - builds with Python 2.1
 
 Revision 1.14  2001/05/02 21:51:28  qboosh
-- adapterized and made spec %%debug ready or added using %%rpm*flags macros
+- adapterized and made spec %debug ready or added using %rpm*flags macros
 
 Revision 1.13  2001/04/30 23:02:01  wrobell
 - up to 1.1.1
@@ -296,10 +362,10 @@
 - release 2, built against libpng >= 1.0.8
 
 Revision 1.9  2000/06/09 07:55:08  kloczek
-- more %%{__make} macros.
+- more %{__make} macros.
 
 Revision 1.8  2000/06/09 07:23:52  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.7  2000/04/09 20:55:56  wrobell
 - added PIL link to Imaging directory
@@ -318,10 +384,10 @@
 - added %attr macro in %file section.
 
 Revision 1.3  1999/12/04 18:14:50  cieciwa
--added file location.
+- added file location.
 
 Revision 1.2  1999/12/04 17:48:53  cieciwa
-empty log message
+- empty log message
 
 Revision 1.1  1999/08/08 09:08:58  wrobell
 - package name changed
@@ -329,4 +395,3 @@
 
 Revision 1.7  1999/07/12 23:06:13  kloczek
 - added using CVS keywords in %changelog (for automating them).
-
================================================================

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



More information about the pld-cvs-commit mailing list