[PyQt4] -doc.noarch,-qsci-api subpkgs

Rex Dieter rdieter at fedoraproject.org
Fri Mar 14 18:13:28 UTC 2014


commit 0d7e97f367e3b083113295727e56d6ed47b6f6b7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Mar 14 13:13:22 2014 -0500

    -doc.noarch,-qsci-api subpkgs

 PyQt4.spec |   37 +++++++++++++++++++++++++++----------
 1 files changed, 27 insertions(+), 10 deletions(-)
---
diff --git a/PyQt4.spec b/PyQt4.spec
index 0db05e6..9ade9b5 100644
--- a/PyQt4.spec
+++ b/PyQt4.spec
@@ -102,13 +102,31 @@ Provides: pyqt4-devel = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: qt4-devel
 Requires: sip-devel
-# when arch->noarch happened
+# when split happened, upgrade path
 Obsoletes: PyQt4-devel < 4.10.3-6
 BuildArch: noarch
 %description devel
 Files needed to build other bindings for C++ classes that inherit from any
 of the Qt4 classes (e.g. KDE or your own).
 
+%package doc
+Summary: PyQt4 developer documentation and examples
+BuildArch: noarch
+# when split happened, upgrade path
+Obsoletes: PyQt4-devel < 4.10.3-6
+Obsoletes: python3-PyQt4-devel < 4.10.3-6
+%description doc
+%{summary}.
+
+# split-out arch'd subpkg, since (currently) %%_qt4_datadir = %%_qt4_libdir
+%package qsci-api
+Summary: Qscintilla API file support
+# when split happened, upgrade path
+Obsoletes: PyQt4-devel < 4.10.3-6
+Obsoletes: python3-PyQt4-devel < 4.10.3-6
+%description qsci-api
+%{summary}.
+
 # The bindings are imported as "PyQt4", hence it's reasonable to name the
 # Python 3 subpackage "python3-PyQt4", despite the apparent tautology
 %package -n python3-%{name}
@@ -140,7 +158,7 @@ Provides: python3-%{name}-webkit-devel = %{version}-%{release}
 Provides: python3-qt4-devel = %{version}-%{release}
 Requires: python3-%{name} = %{version}-%{release}
 Requires: python3-sip-devel
-# when arch->noarch happened
+# when split happened, upgrade path
 Obsoletes: python3-PyQt4-devel < 4.10.3-6
 BuildArch: noarch
 %description -n python3-%{name}-devel
@@ -322,13 +340,17 @@ diff -u ./sip/QtOpenGL/opengl_types.sip.orig \
 %endif
 
 %files devel
-%doc doc/*
-%doc examples/
 %{_bindir}/pylupdate4
 %{_bindir}/pyrcc4
 %{_bindir}/pyuic4
 %{_datadir}/sip/PyQt4/
+
+%files doc
+%doc doc/*
+%doc examples/
+
 %if 0%{?qscintilla}
+%files qsci-api
 %{_qt4_datadir}/qsci/api/python/PyQt4.api
 %endif
 
@@ -371,18 +393,13 @@ diff -u ./sip/QtOpenGL/opengl_types.sip.orig \
 %endif
 
 %files -n python3-%{name}-devel
-%doc doc/*
-%doc examples/
 %{_datadir}/python3-sip/PyQt4/
-%if 0%{?fedora}
-%{_qt4_datadir}/qsci/api/python/PyQt4.api
-%endif
-%endif
 
 
 %changelog
 * Fri Mar 14 2014 Rex Dieter <rdieter at fedoraproject.org> 4.10.3-6
 - polish/improve uic multilib issues, make -devel noarch (#1076346)
+- -doc.noarch,-qsci-api subpkgs
 
 * Mon Feb 17 2014 Rex Dieter <rdieter at fedoraproject.org> 4.10.3-5
 - flesh out python(3)-qt4 related provides


More information about the scm-commits mailing list