rpms/python-imaging/devel python-imaging.spec,1.27,1.28

Karsten Hopp karsten at fedoraproject.org
Wed Apr 15 12:42:22 UTC 2009


Author: karsten

Update of /cvs/extras/rpms/python-imaging/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14583

Modified Files:
	python-imaging.spec 
Log Message:
- disable sane subpackage and sane requirements for mainframes, we don't have
  sane on s390 and s390x



Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/devel/python-imaging.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- python-imaging.spec	26 Feb 2009 21:45:53 -0000	1.27
+++ python-imaging.spec	15 Apr 2009 12:42:21 -0000	1.28
@@ -5,7 +5,7 @@
 Summary:       Python's own image processing library
 Name:          python-imaging
 Version:       1.1.6
-Release:       14%{?dist}
+Release:       15%{?dist}
 
 License:       BSD
 Group:         System Environment/Libraries
@@ -20,7 +20,9 @@
 
 BuildRequires: python-devel, libjpeg-devel, zlib-devel, freetype-devel
 BuildRequires: tkinter, tk-devel
+%ifnarch s390 s390x
 BuildRequires: sane-backends-devel
+%endif
 
 %description
 Python Imaging Library
@@ -45,6 +47,7 @@
 %description devel
 Development files for python-imaging.
 
+%ifnarch s390 s390x
 %package sane
 Summary: Python Module for using scanners
 Group: System Environment/Libraries
@@ -53,6 +56,7 @@
 %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.
+%endif
 
 %package tk
 Summary: Tk interface for python-imaging
@@ -89,9 +93,11 @@
 
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
+%ifnarch s390 s390x
 pushd Sane
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 popd
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -99,9 +105,11 @@
 install -m 644 libImaging/*.h $RPM_BUILD_ROOT/%{py_incdir}/Imaging
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+%ifnarch s390 s390x
 pushd Sane
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 popd
+%endif
 
 # There is no need to ship the binaries since they are already packaged
 # in %doc
@@ -145,6 +153,7 @@
 %{py_incdir}/Imaging
 %doc Docs Scripts Images
 
+%ifnarch s390 s390x
 %files sane
 %defattr (0644,root,root,755)
 %doc Sane/CHANGES Sane/demo*.py Sane/sanedoc.txt
@@ -153,10 +162,15 @@
 %endif
 %{python_sitearch}/_sane.so
 %{python_sitearch}/sane.py*
+%endif
 
 %files tk -f files.tk
 
 %changelog
+* Wed Apr 15 2009 Karsten Hopp <karsten at redhat.com> 1.1.6-15
+- disable sane subpackage and sane requirements for mainframes, we don't have
+  sane on s390 and s390x
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 




More information about the fedora-extras-commits mailing list