From 7a113e951e5254b1d04faf4a6a4e1b47e9fa4215 Mon Sep 17 00:00:00 2001
From: Dan Callaghan <dcallagh(a)redhat.com>
Date: Fri, 17 Jun 2016 13:49:49 +1000
Subject: initial version
---
.gitignore | 1 +
...on-t-install-tests-as-a-top-level-package.patch | 25 ++++++++
...tools-console_scripts-for-usr-bin-unidiff.patch | 63 +++++++++++++++++++++
python-unidiff.spec | 66 ++++++++++++++++++++++
sources | 1 +
5 files changed, 156 insertions(+)
create mode 100644 0001-don-t-install-tests-as-a-top-level-package.patch
create mode 100644 0002-use-setuptools-console_scripts-for-usr-bin-unidiff.patch
create mode 100644 python-unidiff.spec
diff --git a/.gitignore b/.gitignore
index e69de29..87cff53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/unidiff-0.5.2.tar.gz
diff --git a/0001-don-t-install-tests-as-a-top-level-package.patch
b/0001-don-t-install-tests-as-a-top-level-package.patch
new file mode 100644
index 0000000..63c8ee9
--- /dev/null
+++ b/0001-don-t-install-tests-as-a-top-level-package.patch
@@ -0,0 +1,25 @@
+From 8837cc03067f1729848483dc2e3ca50d2c17ebd2 Mon Sep 17 00:00:00 2001
+From: Dan Callaghan <dcallagh(a)redhat.com>
+Date: Thu, 16 Jun 2016 16:27:10 +1000
+Subject: [PATCH 1/2] don't install tests as a top-level package
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 06aa068..54ca7b4 100644
+--- a/setup.py
++++ b/setup.py
+@@ -16,7 +16,7 @@
+ author_email='mbordese(a)gmail.com',
+
url='http://github.com/matiasb/python-unidiff';,
+ license='MIT',
+- packages=find_packages(),
++ packages=find_packages(exclude=['tests']),
+ scripts=['bin/unidiff'],
+ classifiers=[
+ 'Intended Audience :: Developers',
+--
+2.4.11
+
diff --git a/0002-use-setuptools-console_scripts-for-usr-bin-unidiff.patch
b/0002-use-setuptools-console_scripts-for-usr-bin-unidiff.patch
new file mode 100644
index 0000000..c9b213a
--- /dev/null
+++ b/0002-use-setuptools-console_scripts-for-usr-bin-unidiff.patch
@@ -0,0 +1,63 @@
+From 039b96217bcc92ea20268a9466caa42a9a8ce9c9 Mon Sep 17 00:00:00 2001
+From: Dan Callaghan <dcallagh(a)redhat.com>
+Date: Thu, 16 Jun 2016 16:30:40 +1000
+Subject: [PATCH 2/2] use setuptools console_scripts for /usr/bin/unidiff
+
+---
+ setup.py | 6 +++++-
+ bin/unidiff => unidiff/cli.py | 7 ++++---
+ 2 files changed, 9 insertions(+), 4 deletions(-)
+ rename bin/unidiff => unidiff/cli.py (98%)
+ mode change 100755 => 100644
+
+diff --git a/setup.py b/setup.py
+index 54ca7b4..1359493 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']),
+- scripts=['bin/unidiff'],
++ entry_points={
++ 'console_scripts': [
++ 'unidiff = unidiff.cli:main',
++ ],
++ },
+ classifiers=[
+ 'Intended Audience :: Developers',
+ 'Development Status :: 4 - Beta',
+diff --git a/bin/unidiff b/unidiff/cli.py
+old mode 100755
+new mode 100644
+similarity index 98%
+rename from bin/unidiff
+rename to unidiff/cli.py
+index 084df6f..b879ee5
+--- a/bin/unidiff
++++ b/unidiff/cli.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+
+ from __future__ import print_function, unicode_literals
+
+@@ -30,8 +29,7 @@ def get_parser():
+ help='if not specified, read diff data from stdin')
+ return parser
+
+-
+-if __name__ == '__main__':
++def main():
+ parser = get_parser()
+ args = parser.parse_args()
+
+@@ -66,3 +64,6 @@ def get_parser():
+ len(patch.modified_files), len(patch.added_files),
+ len(patch.removed_files)))
+ print('Total: %d addition(s), %d deletion(s)' % (additions, deletions))
++
++if __name__ == '__main__':
++ main()
+--
+2.4.11
+
diff --git a/python-unidiff.spec b/python-unidiff.spec
new file mode 100644
index 0000000..58298fb
--- /dev/null
+++ b/python-unidiff.spec
@@ -0,0 +1,66 @@
+%global modname unidiff
+
+Name: python-%{modname}
+Version: 0.5.2
+Release: 1%{?dist}
+Summary: Python library to parse and interact with unified diffs (patches)
+License: MIT
+URL:
http://github.com/matiasb/python-unidiff
+Source0:
http://pypi.python.org/packages/source/u/%{modname}/%{modname}-%{version}...
+BuildArch: noarch
+BuildRequires: python2-devel
+BuildRequires: python2-nose
+BuildRequires: python3-devel
+BuildRequires: python3-nose
+Patch1: 0001-don-t-install-tests-as-a-top-level-package.patch
+Patch2: 0002-use-setuptools-console_scripts-for-usr-bin-unidiff.patch
+
+%description
+%{name} is a %{summary}.
+
+%package -n python2-%{modname}
+Summary: %{summary}
+
+%description -n python2-%{modname}
+%{name} is a %{summary}.
+
+%package -n python3-%{modname}
+Summary: %{summary}
+
+%description -n python3-%{modname}
+%{name} is a %{summary}.
+
+%prep
+%setup -q -n %{modname}-%{version}
+%patch1 -p1
+%patch2 -p1
+rm -r unidiff.egg-info
+
+%build
+%py2_build
+%py3_build
+
+%install
+%py2_install
+%py3_install
+
+%check
+# Tests fail due to missing samples directory:
+#
https://github.com/matiasb/python-unidiff/pull/23
+#%%{__python2} setup.py test
+#%%{__python3} setup.py test
+
+%files -n python2-%{modname}
+%doc README.md LICENSE
+%{python2_sitelib}/%{modname}
+%{python2_sitelib}/%{modname}*.egg-info
+
+%files -n python3-%{modname}
+%doc README.md LICENSE
+%{_bindir}/%{modname}
+%{python3_sitelib}/%{modname}
+%{python3_sitelib}/%{modname}*.egg-info
+
+%changelog
+* Fri Jun 17 2016 Dan Callaghan <dcallagh(a)redhat.com> - 0.5.2-1
+- initial version
diff --git a/sources b/sources
index e69de29..7c303e1 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+20dd70ba5a35bc95bf869322d6852227 unidiff-0.5.2.tar.gz
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/python-unidiff.git/commit/?h=f23&i...