From b1f30b96a1a5fcf827641a0110ff0112dcae1174 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Mar 17 2016 14:48:31 +0000 Subject: Drop all the patch we no-longer use and update the spec for it --- diff --git a/0001-Fix-processing-all-actions.patch b/0001-Fix-processing-all-actions.patch deleted file mode 100644 index 5250228..0000000 --- a/0001-Fix-processing-all-actions.patch +++ /dev/null @@ -1,23 +0,0 @@ -From fd46a26434324c5e0a999b68a92146429e4c63d7 Mon Sep 17 00:00:00 2001 -From: Till Maas -Date: Mon, 23 Nov 2015 21:30:08 +0100 -Subject: [PATCH] Fix processing all actions - ---- - pkgdb2client/admin.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pkgdb2client/admin.py b/pkgdb2client/admin.py -index 9880f3c..f93ac93 100644 ---- a/pkgdb2client/admin.py -+++ b/pkgdb2client/admin.py -@@ -385,8 +385,8 @@ def do_process(args): - LOG.info("user : {0}".format(args.username)) - - if not args.actionid: -- print 'Processing all requests with status: %s' % args.status - args.status = "Awaiting Review" -+ print 'Processing all requests with status: %s' % args.status - ids = do_list(args) - else: - ids = args.actionid diff --git a/0001-Fix-typo.patch b/0001-Fix-typo.patch deleted file mode 100644 index 0bd946f..0000000 --- a/0001-Fix-typo.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d8945eaf4b54316f00d8738ac5fa35f64a8d6e46 Mon Sep 17 00:00:00 2001 -From: Pierre-Yves Chibon -Date: Thu, 3 Mar 2016 16:04:34 +0100 -Subject: [PATCH] Fix typo - ---- - pkgdb2client/admin.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pkgdb2client/admin.py b/pkgdb2client/admin.py -index 98a59d1..40283f4 100644 ---- a/pkgdb2client/admin.py -+++ b/pkgdb2client/admin.py -@@ -312,7 +312,7 @@ def __handle_request_package(actionid, action): - output = pkgdbclient.update_acl( - action['info']['pkg_name'], - branches=action['info']['pkg_collection'], -- acls=['commit', 'watchbugzilla', 'watchcommits', -+ acls=['commit', 'watchbugzilla', 'watchcommits'], - status='Approved', - user=user.strip(), - namespace=action['info']['pkg_namespace'], --- -2.5.0 - diff --git a/0001-Reverse-debugging-changes.patch b/0001-Reverse-debugging-changes.patch deleted file mode 100644 index c749c3f..0000000 --- a/0001-Reverse-debugging-changes.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2af15d9539c5a56ec858057c125dea095564040d Mon Sep 17 00:00:00 2001 -From: Pierre-Yves Chibon -Date: Fri, 1 Mar 2013 13:16:38 +0100 -Subject: [PATCH 1/3] Reverse debugging changes - ---- - pkgdb-cli | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/pkgdb-cli b/pkgdb-cli -index b0ca6b6..5da6b6b 100755 ---- a/pkgdb-cli -+++ b/pkgdb-cli -@@ -1149,9 +1149,8 @@ def do_update(args): - answer = "Denied" - if args.approve: - answer = "Approved" -- print args -- #answer_acl_request(args.package, args.action, args.user, -- #answer, args.branch, args.username, args.password) -+ answer_acl_request(args.package, args.action, args.user, -+ answer, args.branch, args.username, args.password) - - - def do_branch(args): -@@ -1188,6 +1187,6 @@ if __name__ == '__main__': - except AppError, e: - print '{0}: {1}'.format(e.name, e.message) - sys.exit(4) -- #except Exception, e: -- #print 'Error: {0}'.format(e) -- #sys.exit(5) -+ except Exception, e: -+ print 'Error: {0}'.format(e) -+ sys.exit(5) --- -1.8.1.4 - diff --git a/packagedb-cli.spec b/packagedb-cli.spec index 232c57b..c0e4620 100644 --- a/packagedb-cli.spec +++ b/packagedb-cli.spec @@ -6,7 +6,6 @@ Summary: A CLI for pkgdb License: GPLv2+ URL: https://fedorahosted.org/packagedb-cli/ Source0: https://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz -Patch1: 0001-Fix-typo.patch BuildArch: noarch @@ -49,8 +48,6 @@ It also allows you to orphan and/or retire your package(s). %prep %setup -q -%patch1 -p1 -b . - %build %{__python} setup.py build