From ee99ee0dc34f50730bcfb1b6df4fa000de4d5903 Mon Sep 17 00:00:00 2001 From: Terje Røsten Date: May 14 2019 17:06:21 +0000 Subject: Undo breakage in reqs from previous commit 0.18 --- diff --git a/.gitignore b/.gitignore index a32cd3b..b5e512c 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ bpython-0.9.6.2.tar.gz /bpython-0.16.tar.gz /bpython-0.17.tar.gz /bpython-0.17.1.tar.gz +/bpython-0.18.tar.gz diff --git a/bpython-0.18-path.patch b/bpython-0.18-path.patch new file mode 100644 index 0000000..80b82f9 --- /dev/null +++ b/bpython-0.18-path.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index f8f9433..00967d6 100755 +--- a/setup.py ++++ b/setup.py +@@ -199,7 +199,7 @@ data_files = [ + # desktop shortcut + (os.path.join('share', 'applications'), ['data/org.bpython-interpreter.bpython.desktop']), + # AppData +- (os.path.join('share', 'appinfo'), ['data/org.bpython-interpreter.bpython.appdata.xml']), ++ (os.path.join('share', 'appdata'), ['data/org.bpython-interpreter.bpython.appdata.xml']), + # icon + (os.path.join('share', 'pixmaps'), ['data/bpython.png']) + ] diff --git a/bpython.spec b/bpython.spec index 62e7737..4bf8f0b 100644 --- a/bpython.spec +++ b/bpython.spec @@ -1,16 +1,16 @@ Name: bpython Summary: Fancy curses interface to the Python interactive interpreter -Version: 0.17.1 -Release: 6%{?dist} +Version: 0.18 +Release: 1%{?dist} URL: http://www.bpython-interpreter.org/ License: MIT Source0: https://bpython-interpreter.org/releases/bpython-%{version}.tar.gz +Patch01: bpython-0.18-path.patch BuildArch: noarch BuildRequires: desktop-file-utils BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-sphinx - %description bpython is a fancy interface to the Python interpreter for Unix-like operating systems. It has the following features: @@ -30,13 +30,14 @@ Provides: bpython3 = %{version}-%{release} Provides: bpython = %{version}-%{release} Obsoletes: bpython < 0.17.1-6 Obsoletes: bpython-gtk < 0.14 - %{?python_provide:%python_provide python3-bpython} - -Recommends: python3-bpython-urwid = %{version}-%{release} +Requires: python3-curtsies >= 0.1.18 +Requires: python3-greenlet +Requires: python3-pygments +Requires: python3-requests > 1.2.3 +Requires: python3-six >= 1.5 Recommends: python3dist(jedi) Recommends: python3dist(watchdog) - %description -n python3-bpython bpython is a fancy interface to the Python interpreter for Unix-like operating systems. It has the following features: @@ -54,9 +55,7 @@ This is the Python 3 build of bpython. %package -n python3-bpython-urwid Summary: Urwid interface to the Python 3 interactive interpreter - %{?python_provide:%python_provide python3-bpython-urwid} - Requires: python3-bpython = %{version}-%{release} Requires: python3dist(urwid) Requires: python3dist(twisted) @@ -74,10 +73,9 @@ operating systems. It has the following features: o save the code you've entered to a file o auto indentation -This is the Python 3 build of bpython with urwid. - %prep %setup -q +%patch01 -p1 %build %{py3_build} @@ -106,13 +104,17 @@ ln -s bpython %{buildroot}%{_bindir}/python3-bpython %{_mandir}/man1/bpython.1* %{_mandir}/man5/bpython-config.5* %{_datadir}/pixmaps/bpython.png -%{_datadir}/appdata/bpython.appdata.xml -%{_datadir}/applications/bpython.desktop +%{_datadir}/appdata/org.bpython-interpreter.bpython.appdata.xml +%{_datadir}/applications/org.bpython-interpreter.bpython.desktop %files -n python3-bpython-urwid %{_bindir}/bpython-urwid %changelog +* Tue May 14 2019 Terje Rosten - 0.18-1 +- Undo breakage in reqs from previous commit +- 0.18 + * Fri Mar 08 2019 Miro Hrončok - 0.17.1-6 - Drop Python 2 bpython - Add Python 3 bpython-urwid diff --git a/sources b/sources index 80f5580..0b43ad9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bpython-0.17.1.tar.gz) = 5b5e861646df90510db75520dff9533b71501d35b7af1d152adf2c929b171fa6a2b1c0a6b7eda0311f9315703db161c6a78698a6cd434e5321464d6d1c033e4e +SHA512 (bpython-0.18.tar.gz) = 760143c286e686d4b8d706e38f3b2d2e7c865f960fa8d828ec08a7d0dd198bfa09686ab3c4b27ea365400d60c45b69a3c03ee726879a8825cc91af2a75d28dab