rpms/PyQt/devel PyQt.spec,1.41,1.42

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/PyQt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21482

Modified Files:
	PyQt.spec 
Log Message:
* Tue Jan 29 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.17.4-2
- drop qscintilla support (f9+)



Index: PyQt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt/devel/PyQt.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- PyQt.spec	7 Dec 2007 00:59:33 -0000	1.41
+++ PyQt.spec	29 Jan 2008 15:04:41 -0000	1.42
@@ -4,10 +4,14 @@
 %define qtpkg qt
 %define sip_version 4.7.3
 
+%if 0%{?fedora} < 9
+%define qscintilla 1
+%endif
+
 Summary: Python bindings for Qt
 Name: PyQt
 Version: 3.17.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Development/Languages
@@ -17,7 +21,11 @@
 
 BuildRequires: libXmu-devel
 BuildRequires: python-devel
+%if 0%{?qscintilla}
 BuildRequires: qscintilla-devel
+%else
+Obsoletes: %{name}-qscintilla < %{version}-%{release}
+%endif
 BuildRequires: qt-devel >= %{qtversion}
 BuildRequires: qt-MySQL qt-ODBC qt-PostgreSQL
 BuildRequires: sip-devel >= %{sip_version}
@@ -37,6 +45,10 @@
 Summary: Files needed to build other bindings based on Qt
 Requires: %{name} = %{version}-%{release}
 Requires: sip-devel
+%if ! 0%{?qscintilla}
+Obsoletes: %{name}-qscintilla-devel < %{version}-%{release}
+%endif
+
 Group: Development/Languages
 
 %description devel
@@ -44,13 +56,14 @@
 of the Qt classes (e.g. KDE or your own).
 
 %package examples
-Summary: Examples for PyQt
+Summary: Examples for %{name} 
 Requires: %{name} = %{version}-%{release}
 Group: Development/Languages
 
 %description examples
 Examples code demonstrating how to use the Python bindings for Qt.
 
+%if 0%{?qscintilla}
 %package qscintilla
 Summary: %{name} qscintilla extentions
 Group:   Development/Languages
@@ -67,6 +80,7 @@
 
 %description qscintilla-devel
 %{summary}.
+%endif
 
 
 %prep
@@ -113,6 +127,7 @@
 %doc examples/README examples/*.py
 %doc examples/*.png examples/*.gif examples/*.bmp
 
+%if 0%{?qscintilla}
 %files qscintilla
 %defattr(-,root,root,-)
 %{python_sitearch}/qtext*.so
@@ -120,9 +135,13 @@
 %files qscintilla-devel
 %defattr(-,root,root,-)
 %{_datadir}/sip/qtext/
+%endif
 
 
 %changelog
+* Tue Jan 29 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.17.4-2
+- drop qscintilla support (f9+)
+
 * Thu Dec 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.17.4-1
 - 3.17.4