- update F-11 to 0.10

- move docs into a subpackage
- subpackage wxPython
- subpackage tests
- use proper %%{python_site*} definitions
- make %%{files} more explicit
- add some missing R (fixes #529185, #515570)

ipython.spec

@@ -1,8 +1,10 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%endif
 
 Name:           ipython
 Version:        0.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An enhanced interactive Python shell
 
 Group:          Development/Libraries
@@ -13,6 +15,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel
+Requires:       python-foolscap
+Requires:       python-twisted-core
+Requires:       python-zope-interface
 
 
 %description
@@ -36,41 +41,127 @@ Main features:
  * Easily embeddable in other Python programs.
  * Integrated access to the pdb debugger and the Python profiler.
 
+%package tests
+Summary:        Tests for %{name}
+Group:          Documentation
+Requires:       python-nose
+Requires:       %{name} = %{version}-%{release}
+%description tests
+This package contains the tests of %{name}.
+You can check this way, you can test, if ipython works on your platform.
+
+%package doc
+Summary:        Documentation for %{name}
+Group:          Documentation
+%description doc
+This package contains the documentation of %{name}.
+
+%package gui
+Summary:        Gui applications from %{name}
+Group:          Applications/Editors
+Requires:       %{name} = %{version}-%{release}
+%description gui
+This package contains the gui of %{name}, which requires wxPython.
+
+
+
 %prep
 %setup -q
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+%{__python} setup.py build
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+
+# ipython installs docs automatically, but in the wrong place
+mv %{buildroot}%{_datadir}/doc/%{name} \
+    %{buildroot}%{_datadir}/doc/%{name}-%{version}
+
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
+# -f notests.files
 %defattr(-,root,root,-)
-# ipython installs its own documentation, but we need to own the directory
-%{_datadir}/doc/%{name}
-%{_mandir}/man*/*
 %{_bindir}/ipython
 %{_bindir}/irunner
 %{_bindir}/pycolor
-%{_bindir}/ipython-wx
-%{_bindir}/ipythonx
 %{_bindir}/ipcluster
 %{_bindir}/ipcontroller
 %{_bindir}/ipengine
+%{_mandir}/man*/ipython.*
+%{_mandir}/man*/ipengine*
+%{_mandir}/man*/irunner*
+%{_mandir}/man*/pycolor*
+%{_mandir}/man*/ipc*
+%dir %{python_sitelib}/IPython
+%{python_sitelib}/IPython/UserConfig
+%dir %{python_sitelib}/IPython/config
+%{python_sitelib}/IPython/config/*.py*
+%{python_sitelib}/IPython/Extensions
+%{python_sitelib}/IPython/external
+%{python_sitelib}/IPython/*.py*
+%dir %{python_sitelib}/IPython/frontend
+%{python_sitelib}/IPython/frontend/process
+%{python_sitelib}/IPython/frontend/*.py*
+%dir %{python_sitelib}/IPython/frontend/cocoa
+%{python_sitelib}/IPython/frontend/cocoa/*.py*
+%dir %{python_sitelib}/IPython/tools
+%{python_sitelib}/IPython/tools/*.py*
+%dir %{python_sitelib}/IPython/kernel
+%{python_sitelib}/IPython/kernel/*.py*
+%{python_sitelib}/IPython/kernel/config
+%{python_sitelib}/IPython/kernel/scripts
+%dir %{python_sitelib}/IPython/kernel/core
+%{python_sitelib}/IPython/kernel/core/config
+%{python_sitelib}/IPython/kernel/core/*.py*
+%dir %{python_sitelib}/IPython/testing
+%{python_sitelib}/IPython/testing/*.py*
+%{python_sitelib}/IPython/testing/plugin
+%{python_sitelib}/ipython-%{version}-py?.?.egg-info
+%exclude %{python_sitelib}/IPython/gui
+
+
+%files tests
+%defattr(-,root,root,-)
 %{_bindir}/iptest
-%{python_sitelib}/*
+%{python_sitelib}/IPython/tests
+%{python_sitelib}/IPython/*/tests
+%{python_sitelib}/IPython/*/*/tests
+
+
+%files doc
+%defattr(-,root,root,-)
+# ipython installs its own documentation, but we need to own the directory
+%{_datadir}/doc/%{name}-%{version}
+
+%files gui
+%defattr(-,root,root,-)
+%{_bindir}/ipython-wx
+%{_bindir}/ipythonx
+%{_mandir}/man*/ipython-wx*
+%{_mandir}/man*/ipythonx*
+%{python_sitelib}/IPython/gui
+%{python_sitelib}/IPython/frontend/wx
+
 
 
 %changelog
-* Tue Sep 22 2009 James Bowes <jbowes@redhat.com> 0.10-1
+* Tue Apr 13 2010 Thomas Spura <tomspur@fedoraproject.org> - 0.10-2
+- move docs into a subpackage
+- subpackage wxPython
+- subpackage tests
+- use proper %%{python_site*} definitions
+- make %%{files} more explicit
+- add some missing R (fixes #529185, #515570)
+
+* Tue Sep 22 2009 James Bowes <jbowes@redhat.com> - 0.10-1
 - Update to 0.10
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1-4
@@ -82,16 +173,16 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.9.1-2
 - Rebuild for Python 2.6
 
-* Tue Dec 02 2008 James Bowes <jbowes@redhat.com> 0.9.1-1
+* Tue Dec 02 2008 James Bowes <jbowes@redhat.com> - 0.9.1-1
 - Update to 0.9.1, specfile changes courtesy Greg Swift
 
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.8.4-2
 - Rebuild for Python 2.6
 
-* Wed Jun 11 2008 James Bowes <jbowes@redhat.com> 0.8.4-1
+* Wed Jun 11 2008 James Bowes <jbowes@redhat.com> - 0.8.4-1
 - Update to 0.8.4
 
-* Fri May 30 2008 James Bowes <jbowes@redhat.com> 0.8.3-1
+* Fri May 30 2008 James Bowes <jbowes@redhat.com> - 0.8.3-1
 - Update to 0.8.3
 
 * Wed Dec 12 2007 James Bowes <jbowes@redhat.com> - 0.8.2-1
@@ -106,47 +197,47 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Dec 14 2006 Jason L Tibbitts III <tibbs@math.uh.edu> - 0.7.2-4
 - Rebuild for new Python
 
-* Sat Sep 16 2006 Shahms E. King <shahms@shahms.com> 0.7.2-3
+* Sat Sep 16 2006 Shahms E. King <shahms@shahms.com> - 0.7.2-3
 - Rebuild for FC6
 
-* Fri Aug 11 2006 Shahms E. King <shahms@shahms.com> 0.7.2-2
+* Fri Aug 11 2006 Shahms E. King <shahms@shahms.com> - 0.7.2-2
 - Include, don't ghost .pyo files per new guidelines
 
-* Mon Jun 12 2006 Shahms E. King <shahms@shahms.com> 0.7.2-1
+* Mon Jun 12 2006 Shahms E. King <shahms@shahms.com> - 0.7.2-1
 - Update to new upstream version
 
-* Mon Feb 13 2006 Shahms E. King <shahms@shahms.com> 0.7.1.fix1-2
+* Mon Feb 13 2006 Shahms E. King <shahms@shahms.com> - 0.7.1.fix1-2
 - Rebuild for FC-5
 
-* Mon Jan 30 2006 Shahms E. King <shahms@shahms.com> 0.7.1.fix1-1
+* Mon Jan 30 2006 Shahms E. King <shahms@shahms.com> - 0.7.1.fix1-1
 - New upstream 0.7.1.fix1 which fixes KeyboardInterrupt handling
 
-* Tue Jan 24 2006 Shahms E. King <shahms@shahms.com> 0.7.1-1
+* Tue Jan 24 2006 Shahms E. King <shahms@shahms.com> - 0.7.1-1
 - Update to new upstream 0.7.1
 
-* Thu Jan 12 2006 Shahms E. King <shahms@shahms.com> 0.7-1
+* Thu Jan 12 2006 Shahms E. King <shahms@shahms.com> - 0.7-1
 - Update to new upstream 0.7.0
 
-* Mon Jun 13 2005 Shahms E. King <shahms@shahms.com> 0.6.15-1
+* Mon Jun 13 2005 Shahms E. King <shahms@shahms.com> - 0.6.15-1
 - Add dist tag
 - Update to new upstream (0.6.15)
 
-* Wed Apr 20 2005 Shahms E. King <shahms@shahms.com> 0.6.13-2
+* Wed Apr 20 2005 Shahms E. King <shahms@shahms.com> - 0.6.13-2
 - Fix devel release number
 
-* Mon Apr 18 2005 Shahms E. King <shahms@shahms.com> 0.6.13-1
+* Mon Apr 18 2005 Shahms E. King <shahms@shahms.com> - 0.6.13-1
 - Update to new upstream version
 
-* Fri Apr  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.6.12-2
+* Fri Apr  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.6.12-2
 - Include IPython Extensions and UserConfig directories.
 
-* Fri Mar 25 2005 Shahms E. King <shahms@shahms.com> 0.6.12-1
+* Fri Mar 25 2005 Shahms E. King <shahms@shahms.com> - 0.6.12-1
 - Update to 0.6.12
 - Removed unused python_sitearch define
 
-* Tue Mar 01 2005 Shahms E. King <shahms@shahms.com> 0.6.11-2
+* Tue Mar 01 2005 Shahms E. King <shahms@shahms.com> - 0.6.11-2
 - Fix up %%doc file specifications
 - Use offical .tar.gz, not upstream .src.rpm .tar.gz
 
-* Tue Mar 01 2005 Shahms E. King <shahms@shahms.com> 0.6.11-1
+* Tue Mar 01 2005 Shahms E. King <shahms@shahms.com> - 0.6.11-1
 - Initial release to meet Fedora packaging guidelines