SPECS: python-PyQt.spec - sip-devel or python-sip instead of sip -...

[charles]

Author: charles                      Date: Wed Feb 15 05:54:19 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- sip-devel or python-sip instead of sip
- rm TODO
- rel. 2

---- Files affected:
SPECS:
   python-PyQt.spec (1.54 -> 1.55) 

---- Diffs:

================================================================
Index: SPECS/python-PyQt.spec
diff -u SPECS/python-PyQt.spec:1.54 SPECS/python-PyQt.spec:1.55
--- SPECS/python-PyQt.spec:1.54	Sat Jan 14 17:25:58 2006
+++ SPECS/python-PyQt.spec	Wed Feb 15 06:54:14 2006
@@ -1,8 +1,4 @@
 # $Revision$, $Date$
-# TODO
-# - python-devel-2.4.2-3 marks sip-4.2.1-1 (req python-devel >= 2.2)
-#    sip-4.2.1-1 marks python-PyQt-3.14.1-1 (req sip >= 2:4.2)
-#      python-PyQt-3.14.1-1 marks amarok-scripts-1.3.6-1 (req python-PyQt)
 %define		module	PyQt
 %define		sipver	2:4.3
 Summary:	Python bindings for the Qt toolkit
@@ -10,7 +6,7 @@
 Summary(pl):	Dowiązania do toolkitu Qt dla Pythona
 Name:		python-%{module}
 Version:	3.15.1
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Libraries/Python
 Source0:	http://www.river-bank.demon.co.uk/download/PyQt/PyQt-x11-gpl-%{version}.tar.gz
@@ -24,11 +20,11 @@
 BuildRequires:	qt-devel >= 3.3.0
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.219
-BuildRequires:	sip >= %{sipver}
+BuildRequires:	sip-devel >= %{sipver}
 %pyrequires_eq	python-libs
 Requires:	OpenGL
 Requires:	qscintilla >= 1:1.5
-Requires:	sip >= %{sipver}
+Requires:	python-sip >= %{sipver}
 Obsoletes:	%{module}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -52,7 +48,7 @@
 Summary(pl):	Pliki potrzebne do budowania innych dowiązań bazowanych na Qt
 Group:		Development/Languages/Python
 Requires:	%{name} = %{version}-%{release}
-Requires:	sip >= %{sipver}
+Requires:	sip-devel >= %{sipver}
 
 %description devel
 Files needed to build other bindings for C++ classes that inherit from
@@ -82,9 +78,9 @@
 echo 'yes' | python configure.py \
 	-c -j 3 \
 	-b %{_bindir} \
+	-d %{py_sitedir} \
 	-n %{_includedir}/qt \
 	-o %{_libdir} \
-	-d %{py_sitedir} \
 	-v %{_sipfilesdir}
 
 %{__make} \
@@ -133,6 +129,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.55  2006/02/15 05:54:14  charles
+- sip-devel or python-sip instead of sip
+- rm TODO
+- rel. 2
+
 Revision 1.54  2006/01/14 16:25:58  glen
 - %py_postclean
 
================================================================

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