Hello community, here is the log from the commit of package IPython for openSUSE:Factory checked in at 2013-06-13 16:46:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/IPython (Old) and /work/SRC/openSUSE:Factory/.IPython.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "IPython" Changes: -------- --- /work/SRC/openSUSE:Factory/IPython/IPython.changes 2013-05-28 07:38:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.IPython.new/IPython.changes 2013-06-13 16:46:25.000000000 +0200 @@ -1,0 +2,16 @@ +Wed Jun 5 11:46:27 UTC 2013 - [email protected] + +- Install .desktop files +- Add buildrequires so there is proper detection of dependencies + at build-time +- Add python-distribute buildrequires for proper dependency + detection +- Build full documentation in python 2 version + (not yet working with python 3) +- Include license file and README file +- Change suggests to recommends since suggests are not well + supported +- Manually-specify executable and manual file names to better + identify conflicts between python 2 and python 3 versions + +------------------------------------------------------------------- python3-IPython.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ IPython.spec ++++++ --- /var/tmp/diff_new_pack.PNkB6N/_old 2013-06-13 16:46:26.000000000 +0200 +++ /var/tmp/diff_new_pack.PNkB6N/_new 2013-06-13 16:46:26.000000000 +0200 @@ -26,20 +26,44 @@ Summary: An Enhanced Interactive Python Shell License: BSD-3-Clause Group: Development/Languages/Python -BuildRequires: python-qt4 +BuildArch: noarch +BuildRequires: python +BuildRequires: python-curses +BuildRequires: python-distribute +BuildRequires: python-nose >= 0.10.1 +BuildRequires: python-Cython +BuildRequires: python-opengl +BuildRequires: python-pexpect +BuildRequires: python-pymongo +BuildRequires: python-pyzmq-devel >= 2.1.11 +BuildRequires: python-wxWidgets +BuildRequires: gnome-icon-theme %if 0%{?suse_version} %py_requires BuildRequires: fdupes +BuildRequires: update-desktop-files %endif -Suggests: python-wxWidgets -BuildArch: noarch - +Requires: python-pexpect +Requires: python-pyzmq >= 2.1.11 +Requires: gnome-icon-theme +Recommends: python-curses +Recommends: python-pymongo +Recommends: python-wxWidgets # qtconsole +BuildRequires: python-Pygments +BuildRequires: python-qt4-devel +BuildRequires: python-matplotlib Requires: python-Pygments -Requires: python-pyzmq > 2.1.4 Requires: python-qt4 -#ipython notebook -Requires: python-tornado +Requires: python-matplotlib +# html notebook +BuildRequires: python-tornado >= 2.0 +Requires: python-tornado >= 2.0 +#documentation +BuildRequires: python-Sphinx >= 0.3 +BuildRequires: graphviz +BuildRequires: graphviz-gnome + %description IPython provides a replacement for the interactive python (Python) @@ -67,7 +91,7 @@ %package doc Summary: An Enhanced Interactive Python Shell documentation Group: Documentation/Other -Suggests: %{name} = %{version} +Recommends: %{name} = %{version} %description doc IPython provides a replacement for the interactive python (Python) @@ -81,9 +105,6 @@ %setup -q -n ipython-%{version} # Get rid of library shebangs -# for file in *.py; do -# sed -i '/\/usr\/bin\/env/d' $file -# done find . -type f -name "*.py" -exec sed -i '/#!\/usr\/bin\/env/d' {} \; %build @@ -92,24 +113,74 @@ %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} + +# move automatically installed documentation to the right directory install -d -m 755 %{buildroot}%{_docdir}/ mv -f %{buildroot}/usr/share/doc/ipython/ %{buildroot}%{_docdir}/%{name} +# make docs +pushd docs +PYTHONPATH=$PYTHONPATH:%{buildroot}%{python_sitelib} make html +rm build/html/.buildinfo +mv build/html %{buildroot}%{_docdir}/%{name}/ +popd + +# remove hidden files rm -f %{buildroot}/%{python_sitelib}/IPython/.git_commit_info.ini -rm -f %{buildroot}/%{_defaultdocdir}/IPython/manual/.buildinfo +rm -f %{buildroot}/%{_docdir}/%{name}/manual/.buildinfo %if 0%{?suse_version} > 1010 -%fdupes %{buildroot} +%fdupes %{buildroot}%{_docdir}/%{name}/ + +# install .desktop files +mv %{buildroot}%{_docdir}/%{name}/examples/core/*.desktop ./ +sed -i 's/gnome-netstatus-idle/ipython/g' *.desktop +%suse_update_desktop_file -r -i ipython System TerminalEmulator +%suse_update_desktop_file -r -i ipython-qtconsole System TerminalEmulator +%suse_update_desktop_file -r -i ipython-sh System TerminalEmulator + +# install icons +for i in %{_datadir}/icons/gnome/*/status/gnome-netstatus-idle.* +do + NUM="$(basename $(dirname $(dirname $i)))" + mkdir -p "%{buildroot}%{_datadir}/icons/hicolor/$NUM/apps/" + pushd "%{buildroot}%{_datadir}/icons/hicolor/$NUM/apps/" + ln -s "$i" ./ipython.png + popd +done %endif %files %defattr(-,root,root) -%{_bindir}/* -%{_mandir}/man1/* -%{python_sitelib}/* +%doc COPYING.txt README.rst +%{_bindir}/ipcluster +%{_bindir}/ipcontroller +%{_bindir}/ipengine +%{_bindir}/iplogger +%{_bindir}/iptest +%{_bindir}/ipython +%{_bindir}/irunner +%{_bindir}/pycolor +%{_mandir}/man1/ipcluster.1.gz +%{_mandir}/man1/ipcontroller.1.gz +%{_mandir}/man1/ipengine.1.gz +%{_mandir}/man1/iplogger.1.gz +%{_mandir}/man1/ipython.1.gz +%{_mandir}/man1/irunner.1.gz +%{_mandir}/man1/pycolor.1.gz +%{_datadir}/applications/ipython-qtconsole.desktop +%{_datadir}/applications/ipython-sh.desktop +%{_datadir}/applications/ipython.desktop +%{_datadir}/icons/hicolor/ +%{python_sitelib}/%{name} +%{python_sitelib}/ipython-%{version}-py*.egg-info +%exclude %{_docdir}/%{name}/html/ +%exclude %{_docdir}/%{name}/examples/ %files doc %defattr(-,root,root) -%doc %{_docdir}/%{name} +%{_docdir}/%{name}/ +%exclude %{_docdir}/%{name}/COPYING.txt +%exclude %{_docdir}/%{name}/README.rst %changelog ++++++ python3-IPython.spec ++++++ --- /var/tmp/diff_new_pack.PNkB6N/_old 2013-06-13 16:46:26.000000000 +0200 +++ /var/tmp/diff_new_pack.PNkB6N/_new 2013-06-13 16:46:26.000000000 +0200 @@ -26,26 +26,43 @@ Summary: An Enhanced Interactive Python Shell License: LGPL-2.1+ Group: Development/Languages/Python +BuildArch: noarch BuildRequires: python3 BuildRequires: python3-2to3 +BuildRequires: python3-curses BuildRequires: python3-devel BuildRequires: python3-distribute +BuildRequires: python3-Cython +BuildRequires: python3-opengl +BuildRequires: python3-nose >= 0.10.1 +BuildRequires: python3-pymongo +BuildRequires: python3-pyzmq-devel >= 2.1.11 BuildRequires: python3-xml +BuildRequires: gnome-icon-theme %if 0%{?suse_version} BuildRequires: fdupes +BuildRequires: update-desktop-files %endif -# not available yet upstream -#Suggests: python3-wxWidgets -BuildArch: noarch -Requires: python3-distribute Requires: python3-xml Requires: python(abi) = %{py3_ver} +Requires: python3-pyzmq >= 2.1.11 +Requires: gnome-icon-theme +Recommends: python3-curses +Recommends: python3-pymongo +# not available yet upstream +#Recommends: python3-wxWidgets # qtconsole +BuildRequires: python3-Pygments +BuildRequires: python3-qt4-devel Requires: python3-Pygments -Requires: python3-pyzmq > 2.1.4 Requires: python3-qt4 #ipython notebook -Requires: python3-tornado +BuildRequires: python3-tornado >= 2.0 +Requires: python3-tornado >= 2.0 +#documentation +BuildRequires: python3-Sphinx >= 0.3 +BuildRequires: graphviz +BuildRequires: graphviz-gnome %description IPython provides a replacement for the interactive python (Python) @@ -69,41 +86,112 @@ * Easily embeddable in other Python programs. * Integrated access to the pdb debugger and the Python profiler. -#docs not built with python3 so no doc subpackage now, suggest using python2 IPython docs + +%package doc +Summary: An Enhanced Interactive Python Shell documentation +Group: Documentation/Other +Recommends: %{name} = %{version} + +%description doc +IPython provides a replacement for the interactive python (Python) +interpreter with extra functionality. + +This package contains comprehensive documentation for IPython in +html format, as well as examples of usage. %prep %setup -q -n ipython-%{version} # Get rid of library shebangs -# for file in *.py; do -# sed -i '/\/usr\/bin\/env/d' $file -# done find . -type f -name "*.py" -exec sed -i '/#!\/usr\/bin\/env/d' {} \; %build export CFLAGS="%{optflags}" -/usr/bin/python3 setup.py build +python3 setup.py build %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} -rm -f %{buildroot}%{python3_sitelib}/IPython/.git_commit_info.ini -# Remove docs -rm -rf %{buildroot}/usr/share/doc/ipython/ +# move automatically installed documentation to the right directory +install -d -m 755 %{buildroot}%{_docdir}/ +mv -f %{buildroot}/usr/share/doc/ipython/ %{buildroot}%{_docdir}/%{name} + +# does not seem to work with python 3 +# make docs +# pushd docs +# sed -i 's/python/python3/g' Makefile +# 2to3 -w ./ +# PYTHONPATH=$PYTHONPATH:%{buildroot}%{python3_sitelib} make html +# rm build/html/.buildinfo +# mv build/html %{buildroot}%{_docdir}/%{name}/ +# popd # Fix man pages - for i in %{buildroot}%{_mandir}/man1/*; do mv "$i" "${i%%.1}3.1"; done +# remove hidden files +rm -f %{buildroot}/%{python3_sitelib}/IPython/.git_commit_info.ini +rm -f %{buildroot}/%{_docdir}/%{name}/manual/.buildinfo + +# Fix .desktop files for python 3 +mv %{buildroot}%{_docdir}/%{name}/examples/core/ipython-qtconsole.desktop %{buildroot}%{_docdir}/%{name}/examples/core/ipython3-qtconsole.desktop +mv %{buildroot}%{_docdir}/%{name}/examples/core/ipython-sh.desktop %{buildroot}%{_docdir}/%{name}/examples/core/ipython3-sh.desktop +mv %{buildroot}%{_docdir}/%{name}/examples/core/ipython.desktop %{buildroot}%{_docdir}/%{name}/examples/core/ipython3.desktop +sed -i 's/Python/Python 3/g' %{buildroot}%{_docdir}/%{name}/examples/core/*.desktop +sed -i 's/ipython/ipython3/g' %{buildroot}%{_docdir}/%{name}/examples/core/*.desktop +sed -i 's/Pylab/Pylab3/g' %{buildroot}%{_docdir}/%{name}/examples/core/*.desktop + %if 0%{?suse_version} -%fdupes %{buildroot} +%fdupes %{buildroot}/%{_docdir} + +# install .desktop files +mv %{buildroot}%{_docdir}/%{name}/examples/core/*.desktop ./ +sed -i 's/gnome-netstatus-idle/ipython3/g' *.desktop +%suse_update_desktop_file -r -i ipython3 System TerminalEmulator +%suse_update_desktop_file -r -i ipython3-qtconsole System TerminalEmulator +%suse_update_desktop_file -r -i ipython3-sh System TerminalEmulator + +# install icons +for i in %{_datadir}/icons/gnome/*/status/gnome-netstatus-idle.* +do + NUM="$(basename $(dirname $(dirname $i)))" + mkdir -p "%{buildroot}%{_datadir}/icons/hicolor/$NUM/apps/" + pushd "%{buildroot}%{_datadir}/icons/hicolor/$NUM/apps/" + ln -s "$i" ./ipython3.png + popd +done %endif %files %defattr(-,root,root) -%{_bindir}/* +%doc COPYING.txt README.rst +%{_bindir}/ipcluster3 +%{_bindir}/ipcontroller3 +%{_bindir}/ipengine3 +%{_bindir}/iplogger3 +%{_bindir}/iptest3 +%{_bindir}/ipython3 +%{_bindir}/irunner3 +%{_bindir}/pycolor3 +%{_mandir}/man1/ipcluster3.1.gz +%{_mandir}/man1/ipcontroller3.1.gz +%{_mandir}/man1/ipengine3.1.gz +%{_mandir}/man1/iplogger3.1.gz +%{_mandir}/man1/ipython3.1.gz +%{_mandir}/man1/irunner3.1.gz +%{_mandir}/man1/pycolor3.1.gz +%{_datadir}/applications/ipython3-qtconsole.desktop +%{_datadir}/applications/ipython3-sh.desktop +%{_datadir}/applications/ipython3.desktop +%{_datadir}/icons/hicolor/ %{python3_sitelib}/%{modname} -%{python3_sitelib}/ipython-%{version}-py%{py3_ver}.egg-info -%{_mandir}/man1/* +%{python3_sitelib}/ipython-%{version}-py*.egg-info +%exclude %{_docdir}/%{name}/examples/ + +%files doc +%defattr(-,root,root) +%doc %{_docdir}/%{name} +%exclude %{_docdir}/%{name}/COPYING.txt +%exclude %{_docdir}/%{name}/README.rst %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
