From e70509109c63bfc2acd3608eef30c6049cd735c0 Mon Sep 17 00:00:00 2001 From: Dan Callaghan Date: Jan 09 2018 03:56:55 +0000 Subject: new upstream release 0.5.5: https://github.com/matiasb/python-unidiff/blob/v0.5.5/HISTORY --- diff --git a/.gitignore b/.gitignore index 6cbd8fe..53ec077 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /unidiff-0.5.2.tar.gz /unidiff-0.5.4.tar.gz +/unidiff-0.5.5.tar.gz diff --git a/0001-use-setuptools-console_scripts-for-usr-bin-unidiff.patch b/0001-use-setuptools-console_scripts-for-usr-bin-unidiff.patch index 7958295..d69c463 100644 --- a/0001-use-setuptools-console_scripts-for-usr-bin-unidiff.patch +++ b/0001-use-setuptools-console_scripts-for-usr-bin-unidiff.patch @@ -1,26 +1,26 @@ -From ef6190fe8886dda770e477a1df4b01695b8a1cc8 Mon Sep 17 00:00:00 2001 +From c71d9c6ef0302573be323d1d65783c49bd246fda Mon Sep 17 00:00:00 2001 From: Dan Callaghan Date: Thu, 16 Jun 2016 16:30:40 +1000 Subject: [PATCH] use setuptools console_scripts for /usr/bin/unidiff diff --git a/setup.py b/setup.py -index 54ca7b4..1359493 100644 +index be1835b..e6f57bc 100644 --- a/setup.py +++ b/setup.py -@@ -17,7 +17,11 @@ - url='http://github.com/matiasb/python-unidiff', - license='MIT', - packages=find_packages(exclude=['tests']), +@@ -39,7 +39,11 @@ + author_email=EMAIL, + url=URL, + packages=find_packages(exclude=('tests',)), - scripts=['bin/unidiff'], + entry_points={ + 'console_scripts': [ + 'unidiff = unidiff.cli:main', + ], + }, + include_package_data=True, + license=LICENSE, classifiers=[ - 'Intended Audience :: Developers', - 'Development Status :: 4 - Beta', diff --git a/bin/unidiff b/unidiff/cli.py old mode 100755 new mode 100644 @@ -53,5 +53,5 @@ index 084df6f..b879ee5 +if __name__ == '__main__': + main() -- -2.9.4 +2.13.6 diff --git a/python-unidiff.spec b/python-unidiff.spec index da98524..be27df5 100644 --- a/python-unidiff.spec +++ b/python-unidiff.spec @@ -7,8 +7,8 @@ %endif Name: python-%{modname} -Version: 0.5.4 -Release: 2%{?dist} +Version: 0.5.5 +Release: 1%{?dist} Summary: Python library to parse and interact with unified diffs (patches) License: MIT URL: http://github.com/matiasb/python-unidiff @@ -62,16 +62,15 @@ rm -r unidiff.egg-info %endif %check -# Tests fail due to missing samples directory: -# https://github.com/matiasb/python-unidiff/pull/23 -#%%{__python2} setup.py test +# Missing from tarball: https://github.com/matiasb/python-unidiff/issues/51 +#PYTHONPATH=%%{buildroot}%%{python2_sitelib} %%{__python2} -m unittest discover -s tests/ #%%if %%{with python3} -#%%{__python3} setup.py test +#PYTHONPATH=%%{buildroot}%%{python2_sitelib} %%{__python3} -m unittest discover -s tests/ #%%endif %files -n python2-%{modname} %license LICENSE -%doc README.md +%doc README.rst HISTORY %if !%{with python3} # We ship the Python 3 version of the command unless there is no Python 3 version. %{_bindir}/%{modname} @@ -82,13 +81,17 @@ rm -r unidiff.egg-info %if %{with python3} %files -n python%{python3_pkgversion}-%{modname} %license LICENSE -%doc README.md +%doc README.rst HISTORY %{_bindir}/%{modname} %{python3_sitelib}/%{modname} %{python3_sitelib}/%{modname}*.egg-info %endif %changelog +* Tue Jan 09 2018 Dan Callaghan - 0.5.5-1 +- new upstream release 0.5.5: + https://github.com/matiasb/python-unidiff/blob/v0.5.5/HISTORY + * Thu Jul 27 2017 Fedora Release Engineering - 0.5.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 1bf4bee..b2a0222 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (unidiff-0.5.4.tar.gz) = bd452cd86ba995ef5974b12a8934b5549824fb0a4fce815f5a47a8204afddbcbab3f45e010e1adf6a184916226cc78c5f405105e88b9869bb1476f6a9d714027 +SHA512 (unidiff-0.5.5.tar.gz) = eaa71dfb6c449f18dd23204070c8afa8185bc64151519e8b85a82978ab51984aafd2e26b948657352f8b0277e7fbfe68c71e0b7cb3fb56cd3e789a77296f5c9e