SPECS: python-aggdraw.spec - unified bcond name: freetype2 -> free...

[qboosh]

Author: qboosh                       Date: Wed Feb  6 20:29:22 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified bcond name: freetype2 -> freetype
- patch must be packaged unconditionally

---- Files affected:
SPECS:
   python-aggdraw.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/python-aggdraw.spec
diff -u SPECS/python-aggdraw.spec:1.2 SPECS/python-aggdraw.spec:1.3
--- SPECS/python-aggdraw.spec:1.2	Sun Oct 14 19:27:37 2007
+++ SPECS/python-aggdraw.spec	Wed Feb  6 21:29:17 2008
@@ -7,7 +7,8 @@
 %define		package		aggdraw
 %define		buildver	20051010
 #
-%bcond_without	freetype2	# Build without freetype support
+# Conditional build:
+%bcond_without	freetype	# Build without freetype support
 #
 Summary:	An add-on to the PIL library that supports anti-aliased drawing
 Summary(pl.UTF-8):	Dodatek do biblioteki PIL z obsługą rysowania z wygładzaniem
@@ -18,9 +19,9 @@
 Group:		Libraries/Python
 Source0:	http://effbot.org/media/downloads/%{package}-%{version}-%{buildver}.zip
 # Source0-md5:	9dd2dc67f079592d87970aed0bc5d519
-%{?with_freetype2:Patch0:	%{name}-freetype-enable.patch}
+Patch0:		%{name}-freetype-enable.patch
 URL:		http://effbot.org/zone/aggdraw-index.htm
-%{?with_freetype2:BuildRequires:	freetype-devel}
+%{?with_freetype:BuildRequires:	freetype-devel >= 2.0}
 BuildRequires:	python-devel >= 1:2.4
 BuildRequires:	rpm-pythonprov
 %pyrequires_eq	python-modules
@@ -42,12 +43,12 @@
 
 %prep
 %setup -q -n %{package}-%{version}-%{buildver}
-%if %{with freetype2}
+%if %{with freetype}
 %patch0 -p1
 %endif
 
 %build
-python setup.py build
+%{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -70,9 +71,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2008-02-06 20:29:17  qboosh
+- unified bcond name: freetype2 -> freetype
+- patch must be packaged unconditionally
+
 Revision 1.2  2007-10-14 17:27:37  beorn
 - Added Suggests:
 
 Revision 1.1  2007/10/14 14:21:16  beorn
 - initial
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/python-aggdraw.spec?r1=1.2&r2=1.3&f=u