From 0bc3e37220ba2f1eaa75a985594e73c3e77447cc Mon Sep 17 00:00:00 2001 From: Carl George Date: Feb 28 2018 14:47:56 +0000 Subject: Latest upstream --- diff --git a/.gitignore b/.gitignore index ea572ff..50c5fc5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /pdir2-0.2.1.tar.gz /pdir2-0.2.2.tar.gz +/pdir2-0.3.0.tar.gz diff --git a/python-pdir2.spec b/python-pdir2.spec index 998b571..701e84b 100644 --- a/python-pdir2.spec +++ b/python-pdir2.spec @@ -3,8 +3,8 @@ %{?fedora:%bcond_without tests} Name: python-%{srcname} -Version: 0.2.2 -Release: 3%{?dist} +Version: 0.3.0 +Release: 1%{?dist} Summary: Pretty dir() printing with joy License: MIT URL: https://pypi.python.org/pypi/%{srcname} @@ -22,7 +22,7 @@ bpython, and Jupyter Notebook. %package -n python2-%{srcname} -Summary: Pretty dir() printing with joy +Summary: %{summary} BuildRequires: python2-devel BuildRequires: python%{?fedora:2}-setuptools %if %{with tests} @@ -41,7 +41,7 @@ bpython, and Jupyter Notebook. %package -n python%{python3_pkgversion}-%{srcname} -Summary: Pretty dir() printing with joy +Summary: %{summary} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools %if %{with tests} @@ -81,16 +81,21 @@ bpython, and Jupyter Notebook. %files -n python2-%{srcname} %license LICENSE %doc docs/README.rst -%{python2_sitelib}/* +%{python2_sitelib}/pdir +%{python2_sitelib}/%{srcname}-%{version}-py%{python2_version}.egg-info %files -n python%{python3_pkgversion}-%{srcname} %license LICENSE %doc docs/README.rst -%{python3_sitelib}/* +%{python3_sitelib}/pdir +%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info %changelog +* Wed Feb 28 2018 Carl George - 0.3.0-1 +- Latest upstream + * Tue Feb 27 2018 Iryna Shcherbina - 0.2.2-3 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) diff --git a/remove-environment-markers.patch b/remove-environment-markers.patch index a89c7e8..29c5534 100644 --- a/remove-environment-markers.patch +++ b/remove-environment-markers.patch @@ -1,17 +1,15 @@ Generate requirements list dynamically instead of using environment markers. This allows using versions of setuptools older than 20.6.8. -diff -Nurp pdir2-0.2.2.orig/setup.py pdir2-0.2.2/setup.py ---- pdir2-0.2.2.orig/setup.py 2017-10-14 13:11:46.000000000 -0500 -+++ pdir2-0.2.2/setup.py 2017-10-20 20:55:07.353242820 -0500 -@@ -1,9 +1,17 @@ +diff -Nurp pdir2-0.3.0.orig/setup.py pdir2-0.3.0/setup.py +--- pdir2-0.3.0.orig/setup.py 2018-02-10 00:03:21.000000000 -0600 ++++ pdir2-0.3.0/setup.py 2018-02-28 08:02:50.982899303 -0600 +@@ -1,7 +1,15 @@ import codecs +import sys +import platform - from setuptools import setup - readme = codecs.open('docs/README.rst', encoding='utf-8').read() - history = codecs.open('docs/HISTORY.rst', encoding='utf-8').read() + from setuptools import setup +requirements = [] +if platform.system == 'Windows': @@ -19,10 +17,10 @@ diff -Nurp pdir2-0.2.2.orig/setup.py pdir2-0.2.2/setup.py +if sys.version_info[:2] < (3, 4): + requirements.append('enum34') + - setup( - name='pdir2', - version='0.2.2', -@@ -16,13 +24,9 @@ setup( + readme = codecs.open('docs/README.rst', encoding='utf-8').read() + history = codecs.open('docs/HISTORY.rst', encoding='utf-8').read() + +@@ -17,13 +25,9 @@ setup( 'pdir', ], setup_requires=[ diff --git a/sources b/sources index 1415aa3..0bf17c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pdir2-0.2.2.tar.gz) = 516f85fee0337752aab5015fbac6376b52d13da1237dec81129af7e60eb26f64afa06328a4004ac0157eae8a082d6bd82511c6e3a4ae308c76d06e405e934298 +SHA512 (pdir2-0.3.0.tar.gz) = 8d8096fc30a2e784f332a2dc5c8d2448e8d4ca642d3b5bd5a0503660f4e1ffdc9266ca2c66df89ba84a3a0deb28161347be41d2f2b0badda935a6a6c00ebbe66