terjeros pushed to bpython (master). "- 0.14.1 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 8 18:31:51 UTC 2015
>From 1a583fd1d6374719c910e5285f0d0f72926a2318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Terje=20R=C3=B8sten?= <terje.rosten at ntnu.no>
Date: Thu, 26 Mar 2015 19:39:36 +0100
Subject: - 0.14.1 - gtk gone upstream, remove sub package and add obsolete -
appdata, desktop file and png upstream - new deps - curtsies now default
diff --git a/.gitignore b/.gitignore
index 70a020a..167fa26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ bpython-0.9.6.2.tar.gz
/bpython-0.12.tar.gz
/bpython-0.13.1.tar.gz
/bpython-0.13.2.tar.gz
+/bpython-0.14.1.tar.gz
diff --git a/bpython-0.9.7.1-desktop.patch b/bpython-0.9.7.1-desktop.patch
deleted file mode 100644
index 0850c3b..0000000
--- a/bpython-0.9.7.1-desktop.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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 476ef0c..9392f05 100644
--- a/bpython.spec
+++ b/bpython.spec
@@ -2,15 +2,13 @@
Name: bpython
Summary: Fancy curses interface to the Python interactive interpreter
-Version: 0.13.2
-Release: 2%{?dist}
+Version: 0.14.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
# 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
BuildRequires: python-setuptools
@@ -20,9 +18,12 @@ BuildRequires: desktop-file-utils
BuildRequires: python3-devel
BuildRequires: python3-setuptools
%endif # if with_python3
+Requires: python-curtsies < 0.2
+Requires: python-greenlet
Requires: python-pygments
-Requires: python-requests
+Requires: python-requests > 1.2.3
Requires: python-urwid
+Obsoletes: bpython-gtk < 0.14
%description
bpython is a fancy interface to the Python interpreter for Unix-like
@@ -37,34 +38,15 @@ operating systems. It has the following features:
o save the code you've entered to a file
o auto indentation
-%package gtk
-Summary: Fancy curses interface to the Python interactive interpreter
-Group: Development/Languages
-Requires: bpython
-Requires: pygtk2
-
-%description gtk
-bpython is a fancy interface to the Python interpreter for Unix-like
-operating systems. It has the following features:
- o in-line syntax highlighting
- o readline-like autocomplete with suggestions displayed as you type
- o expected parameter list for any Python function.
- o eewind function to pop the last line of code from memory and
- re-evaluate.
- o send the code you've entered off to a pastebin and display the
- pastebin URL for copying, etc.
- o save the code you've entered to a file
- o auto indentation
-
-This is the GTK version of bpython.
-
%if 0%{?with_python3}
%package -n python3-bpython
Summary: Fancy curses interface to the Python 3 interactive interpreter
Group: Development/Languages
Provides: bpython3 = %{version}-%{release}
+Requires: python3-curtsies < 0.2
+Requires: python3-greenlet
Requires: python3-pygments
-Requires: python3-requests
+Requires: python3-requests > 1.2.3
#Requires: python3-urwid
%description -n python3-bpython
@@ -85,7 +67,6 @@ This is the Python 3 build of bpython
%prep
%setup -q
-%patch0 -p1
%if 0%{?with_python3}
rm -rf %{py3dir}
cp -a . %{py3dir}
@@ -106,95 +87,57 @@ popd
%if 0%{?with_python3}
pushd %{py3dir}
%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
-# Move to bpython3
-mv %{buildroot}/%{_bindir}/%{name} %{buildroot}/%{_bindir}/%{name}3
-# Create symlink for compat reasons
-ln -s %{name}3 %{buildroot}%{_bindir}/python3-%{name}
+
# python3-urwid ok, however python3 twisted also needed
-#mv %{buildroot}/%{_bindir}/%{name}-urwid %{buildroot}/%{_bindir}/python3-%{name}-urwid
rm -f %{buildroot}%{_bindir}/bpython-urwid
-# Not support for gtk/curtsies in Python 3 yet
-rm -f %{buildroot}%{_datadir}/applications/%{name}.desktop
-rm -f %{buildroot}%{_bindir}/bpython-gtk
-rm -f %{buildroot}%{_bindir}/bpython-curtsies
+
+# Move python3
+mv %{buildroot}/%{_bindir}/bpython %{buildroot}/%{_bindir}/bpython3
+mv %{buildroot}/%{_bindir}/bpython-curses %{buildroot}/%{_bindir}/bpython3-curses
+mv %{buildroot}/%{_bindir}/bpbd %{buildroot}%{_bindir}/bpbd3
+
+# Create symlink for compat reasons
+ln -s bpython3 %{buildroot}%{_bindir}/python3-bpython
+
popd
%endif # with_python3
-
%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
-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
-# Not support for curtsies yet
-rm -f %{buildroot}%{_bindir}/bpython-curtsies
-
-# Register as an application to be visible in the software center
-#
-# NOTE: It would be *awesome* if this file was maintained by the upstream
-# project, translated and installed into the right place during `make install`.
-#
-# See http://www.freedesktop.org/software/appstream/docs/ for more details.
-#
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Ryan Lerch <rlerch at redhat.com> -->
-<!--
-EmailAddress: bob at bpython-interpreter.org
-SentUpstream: 2014-09-17
--->
-<application>
- <id type="desktop">bpython.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <summary>Graphical interface for the Python console</summary>
- <description>
- <p>
- bpython is a graphical alternative for the Python console.
- It provides a number of additional features that are not possible with the
- regular (terminal based) Python console, including: syntax highlighting,
- command autocompletion, parameter lists for built in Python functions,
- and the ability to save code to a file.
- </p>
- </description>
- <url type="homepage">http://www.bpython-interpreter.org/</url>
- <screenshots>
- <screenshot type="default">https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/bpython/a.png</screenshot>
- </screenshots>
- <!-- FIXME: change this to an upstream email address for spec updates
- <updatecontact>someone_who_cares at upstream_project.org</updatecontact>
- -->
-</application>
-EOF
%files
-%doc AUTHORS CHANGELOG LICENSE ROADMAP TODO
-%doc light.theme sample-config sample.theme
-%{_bindir}/%{name}
-%{_bindir}/%{name}-urwid
-%{python_sitelib}/%{name}*
+%doc AUTHORS CHANGELOG LICENSE README.rst
+%doc light.theme sample.theme
+%{_bindir}/bpbd
+%{_bindir}/bpython
+%{_bindir}/bpython-curses
+%{_bindir}/bpython-urwid
+%{python_sitelib}/bpython*
%{python_sitelib}/bpdb
-%{_mandir}/man1/%{name}.1*
-%{_mandir}/man5/%{name}-config.5*
-%{_datadir}/pixmaps/%{name}.png
-
-%files gtk
-%doc AUTHORS CHANGELOG LICENSE ROADMAP TODO
-%{_bindir}/%{name}-gtk
-%{_datadir}/appdata/%{name}.appdata.xml
-%{_datadir}/applications/%{name}.desktop
+%{_mandir}/man1/bpython.1*
+%{_mandir}/man5/bpython-config.5*
+%{_datadir}/pixmaps/bpython.png
+%{_datadir}/appdata/bpython.appdata.xml
+%{_datadir}/applications/bpython.desktop
%if 0%{?with_python3}
%files -n python3-bpython
-%doc AUTHORS CHANGELOG LICENSE ROADMAP TODO
-%doc light.theme sample-config sample.theme
-%{_bindir}/python3-%{name}
+%doc AUTHORS CHANGELOG LICENSE README.rst
+%doc light.theme sample.theme
+%{_bindir}/bpbd3
%{_bindir}/bpython3
-#{_bindir}/python3-%{name}-urwid
-%{python3_sitelib}/%{name}*
+%{_bindir}/bpython3-curses
+%{_bindir}/python3-bpython
+%{python3_sitelib}/bpython*
%{python3_sitelib}/bpdb
%endif # with_python3
%changelog
+* Thu Mar 26 2015 Terje Rosten <terje.rosten at ntnu.no> - 0.14.1-1
+- 0.14.1
+- gtk gone upstream, remove sub package and add obsolete
+- appdata, desktop file and png upstream
+- new deps
+- curtsies now default
+
* Thu Mar 26 2015 Richard Hughes <rhughes at redhat.com> - 0.13.2-2
- Add an AppData file for the software center
diff --git a/sources b/sources
index 1d8b802..78db763 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-3d3b43e4149d449f8656e87634f44f47 bpython-0.13.2.tar.gz
-104e5f804b904afecbe85c3c05462fc0 bpython.png
+106551e4f563f2575f67a3738a56b815 bpython-0.14.1.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/bpython.git/commit/?h=master&id=1a583fd1d6374719c910e5285f0d0f72926a2318
More information about the scm-commits
mailing list