rpms/PyQt/devel PyQt.spec,1.38,1.39

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Mon Nov 12 16:31:16 UTC 2007


Author: rdieter

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

Modified Files:
	PyQt.spec 
Log Message:
* Mon Nov 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.17.3-2
- -qscintilla(-devel) subpkgs
- License: GPLv2
- fix %qtversion
- don't own %_datadir/sip (sip-devel owns it)



Index: PyQt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt/devel/PyQt.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- PyQt.spec	22 Oct 2007 15:59:24 -0000	1.38
+++ PyQt.spec	12 Nov 2007 16:30:44 -0000	1.39
@@ -1,28 +1,26 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define minor %{nil}
 
-%define qtversion 3.3.8
+%define qtversion 1:3.3.8
 %define qtpkg qt
 %define sip_version 4.7.1
 
 Summary: Python bindings for Qt
 Name: PyQt
 Version: 3.17.3
-Release: 1%{?dist}
-License: GPL
+Release: 2%{?dist}
+License: GPLv2
 Group: Development/Languages
 Url: http://www.riverbankcomputing.co.uk/pyqt/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: http://www.riverbankcomputing.co.uk/download/sip/%{name}-x11-gpl-%{version}.tar.gz
 
-BuildRequires: qt-MySQL >= %{qtversion}
-BuildRequires: qt-PostgreSQL >= %{qtversion}
-BuildRequires: qt-ODBC >= %{qtversion}
-BuildRequires: sip-devel >= %{sip_version}
-BuildRequires: qt-devel >= %{qtversion}
+BuildRequires: libXmu-devel
 BuildRequires: python-devel
-BuildRequires: libGL-devel
-BuildRequires: libGLU-devel
+BuildRequires: qscintilla-devel
+BuildRequires: qt-devel >= %{qtversion}
+BuildRequires: qt-MySQL qt-ODBC qt-PostgreSQL
+BuildRequires: sip-devel >= %{sip_version}
 BuildRequires: libXmu-devel
 
 Requires: qt >= %{qtversion}
@@ -49,9 +47,28 @@
 %description examples
 Examples code demonstrating how to use the Python bindings for Qt.
 
+%package qscintilla
+Summary: %{name} qscintilla extentions
+Group:   Development/Languages
+Requires: %{name} = %{version}-%{release}
+
+%description qscintilla 
+%{summary}.
+
+%package qscintilla-devel
+Summary: Libraries and header files for %{name} development
+Group:   Development/Libraries
+Requires: %{name}-qscintilla = %{version}-%{release}
+Requires: %{name}-devel
+
+%description qscintilla-devel
+%{summary}.
+
+
 %prep
 %setup -q -n %{name}-x11-gpl-%{version}
 
+
 %build
 QTDIR="" && . /etc/profile.d/qt.sh
 
@@ -61,6 +78,7 @@
 make -C qt %{?_smp_mflags}
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 
@@ -68,26 +86,45 @@
 
 mv examples3 examples
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %files
-%defattr(-,root,root)
-%doc README NEWS
+%defattr(-,root,root,-)
+%doc README LICENSE NEWS
 %{_bindir}/*
 %{python_sitearch}/*
+%exclude %{python_sitearch}/qtext*.so
 
 %files devel
-%defattr(-,root,root)
-%{_datadir}/sip
+%defattr(-,root,root,-)
+%{_datadir}/sip/*
+%exclude %{_datadir}/sip/qtext/
 %doc doc/PyQt.html
 
 %files examples
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc examples/README examples/*.py
 %doc examples/*.png examples/*.gif examples/*.bmp
 
+%files qscintilla
+%defattr(-,root,root,-)
+%{python_sitearch}/qtext*.so
+
+%files qscintilla-devel
+%defattr(-,root,root,-)
+%{_datadir}/sip/qtext/
+
+
 %changelog
+* Mon Nov 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.17.3-2
+- -qscintilla(-devel) subpkgs
+- License: GPLv2
+- fix %%qtversion
+- don't own %%_datadir/sip (sip-devel owns it)
+
 * Mon Oct 22 2007 Than Ngo <than at redhat.com> - 3.17.3-1
 - 3.17.3
 




More information about the fedora-extras-commits mailing list