[bpython] - 0.9.7.1

[terjeros]

commit 176d1db23598bb52d601db778d21b6cfcb5fb03b
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Thu Sep 16 20:04:25 2010 +0200

    - 0.9.7.1

 .gitignore                    |    2 +
 bpython-0.9.6.2-suspend.patch |   54 -----------------------------------------
 bpython-0.9.7.1-desktop.patch |   18 +++++++++++++
 bpython.spec                  |   38 ++++++++++++++++------------
 sources                       |    3 +-
 5 files changed, 44 insertions(+), 71 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4bba16e..43342e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 bpython-0.9.6.2.tar.gz
+/bpython-0.9.7.1.tar.gz
+/bpython.png
diff --git a/bpython-0.9.7.1-desktop.patch b/bpython-0.9.7.1-desktop.patch
new file mode 100644
index 0000000..0850c3b
--- /dev/null
+++ b/bpython-0.9.7.1-desktop.patch
@@ -0,0 +1,18 @@
+--- bpython-0.9.7.1/data/bpython.desktop~	2010-05-27 23:42:55.000000000 +0200
++++ bpython-0.9.7.1/data/bpython.desktop	2010-09-02 22:19:27.000000000 +0200
+@@ -1,9 +1,11 @@
+ [Desktop Entry]
+-Icon=/usr/share/pixmaps/python.xpm
+ Name=bpython
+ Comment=A fancy interface to the python interpreter!
+-Exec=/usr/bin/bpython
+-Terminal=true
++Exec=bpython-gtk
++Icon=bpython.png
++Terminal=false
+ Type=Application
+-Categories=Development;Utility;ConsoleOnly;
++Categories=Development;Utility;
+ StartupNotify=true
++
++
diff --git a/bpython.spec b/bpython.spec
index 939d083..f6cd750 100644
--- a/bpython.spec
+++ b/bpython.spec
@@ -6,17 +6,18 @@
 
 Name:          bpython
 Summary:       Fancy curses interface to the Python interactive interpreter
-Version:       0.9.6.2
-Release:       7%{?dist}
+Version:       0.9.7.1
+Release:       1%{?dist}
 URL:           http://www.bpython-interpreter.org/
 Group:         Development/Libraries
 License:       MIT
 Source0:       http://www.bpython-interpreter.org/releases/bpython-%{version}.tar.gz
-# http://bitbucket.org/bobf/bpython/issue/106/cant-suspend-ctrl-z-bpython
-Patch0:        bpython-0.9.6.2-suspend.patch
+# some gimp resize of http://bpython-interpreter.org/static/img/bpython-logo.png
+Source1:       bpython.png
+Patch0:        bpython-0.9.7.1-desktop.patch
 BuildArch:     noarch
 BuildRequires: python-devel python-setuptools desktop-file-utils
-Requires:      python-pygments
+Requires:      python-pygments pygtk2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?with_python3}
@@ -72,7 +73,6 @@ cp -a . %{py3dir}
 # 2to3 is done for us by the setup.py
 %endif # with_python3
 
-
 %build
 %{__python} setup.py build
 
@@ -98,35 +98,41 @@ popd
 %endif # with_python3
 
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-%{__rm} -f %{buildroot}%{_datadir}/applications/%{name}.desktop
-
-# Leave this out for now, 0.9.7 will ship a stable gtk version
-%{__rm} -f %{buildroot}%{_bindir}/bpython-gtk
-
-#desktop-file-install --delete-original        \
-#  --dir %{buildroot}%{_datadir}/applications  \
-#  %{buildroot}%{_datadir}/applications/%{name}.desktop
+desktop-file-install --delete-original         \
+   --dir %{buildroot}%{_datadir}/applications  \
+   %{buildroot}%{_datadir}/applications/%{name}.desktop
+%{__install} -D -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS CHANGELOG doc LICENSE light.theme README sample-config sample.theme
+%doc AUTHORS CHANGELOG LICENSE README ROADMAP TODO
+%doc light.theme sample-config sample.theme doc
 %{_bindir}/%{name}
+%{_bindir}/%{name}-gtk
 %{python_sitelib}/%{name}*
+%{python_sitelib}/bpdb
 %{_mandir}/man1/%{name}.1*
 %{_mandir}/man5/%{name}-config.5*
-#{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/pixmaps/%{name}.png
 
 %if 0%{?with_python3}
 %files -n python3-bpython
 %defattr(-, root, root, -)
+%doc AUTHORS CHANGELOG LICENSE README ROADMAP TODO
+%doc light.theme sample-config sample.theme doc
 %{_bindir}/python3-%{name}
 %{python3_sitelib}/%{name}*
+%{python3_sitelib}/bpdb
 %endif # with_python3
 
 %changelog
+* Thu Sep  2 2010 Terje Rosten <terje.rosten at ntnu.no> - 0.9.7.1-1
+- 0.9.7.1
+
 * Wed Aug 25 2010 Thomas Spura <tomspur at fedoraproject.org> - 0.9.6.2-7
 - rebuild with python3.2
   http://lists.fedoraproject.org/pipermail/devel/2010-August/141368.html
diff --git a/sources b/sources
index d513a8e..328de7c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-d30fdb663fa9957c21c63108ed249b59  bpython-0.9.6.2.tar.gz
+f32ce6aa8ae6af8d2cf65e13f58859d4  bpython-0.9.7.1.tar.gz
+104e5f804b904afecbe85c3c05462fc0  bpython.png