[rebase-helper] Remove dependency to pkgdiff from setup (#1176563)

Petr Hracek phracek at fedoraproject.org
Mon Jan 19 15:53:17 UTC 2015


commit 00e847fefcbccc61cca8d189669a31e7e9170cf0
Author: Petr Hracek <phracek at redhat.com>
Date:   Mon Jan 19 16:53:08 2015 +0100

    Remove dependency to pkgdiff from setup (#1176563)
    
    Signed-off-by: Petr Hracek <phracek at redhat.com>

 rebase-helper-setup-pkgdiff.patch |   21 +++++++++++++++++++++
 rebase-helper.spec                |    7 ++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/rebase-helper-setup-pkgdiff.patch b/rebase-helper-setup-pkgdiff.patch
new file mode 100644
index 0000000..fba5fe1
--- /dev/null
+++ b/rebase-helper-setup-pkgdiff.patch
@@ -0,0 +1,21 @@
+diff --git a/setup.py b/setup.py
+index 322a185..a811d52 100755
+--- a/setup.py
++++ b/setup.py
+@@ -79,8 +79,6 @@ class PyTest(Command):
+ 
+         raise SystemExit(retcode)
+ 
+-install_requires = ['pkgdiff >= 1.6.3']
+-
+ setup(
+     name='rebasehelper',
+     version=VERSION,
+@@ -93,7 +91,6 @@ setup(
+     packages=['rebasehelper'],
+     include_package_data=True,
+     entry_points={'console_scripts': ['rebase-helper=rebasehelper.cli:CliHelper.run']},
+-    install_requires=install_requires,
+     setup_requires=[],
+     classifiers=['Development Status :: 4 - Beta',
+                    'Environment :: Console',
diff --git a/rebase-helper.spec b/rebase-helper.spec
index 430f20c..da1a2f6 100644
--- a/rebase-helper.spec
+++ b/rebase-helper.spec
@@ -2,7 +2,7 @@
 
 Name:           rebase-helper
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The tool which helps you with rebase package
 
 License:        GPLv2+
@@ -24,6 +24,7 @@ Requires:       pkgdiff >= 1.6.3
 Requires:       rpm-python
 Requires:       python-six
 Patch01:	rebase-helper-download-test.patch
+Patch02:	rebase-helper-setup-pkgdiff.patch
 
 %description
 Rebase-Helper is a tool to help package maintainers to update
@@ -38,6 +39,7 @@ comparing to the previous version.
 rm -rf %{name}.egg-info
 
 %patch01 -p1 -b .download
+%patch02 -p1 -b .pkgdiff
 
 %build
 %{__python2} setup.py build
@@ -55,6 +57,9 @@ rm -rf %{name}.egg-info
 %{python2_sitelib}/%{rebasename}-%{version}-py?.?.egg-info
 
 %changelog
+* Mon Jan 19 2015 Petr Hracek <phracek at redhat.com> - 0.4.0-2
+- Remove dependency to pkgdiff from setup (#1176563)
+
 * Fri Dec 05 2014 Petr Hracek <phracek at redhat.com> - 0.4.0-1
 - New upstream release
 


More information about the scm-commits mailing list