diff --git a/bodhi-0.4.10-python-fedora-0.3.patch b/bodhi-0.4.10-python-fedora-0.3.patch new file mode 100644 index 0000000..e67626f --- /dev/null +++ b/bodhi-0.4.10-python-fedora-0.3.patch @@ -0,0 +1,83 @@ +--- bodhi/tools/bodhi_client.py.orig 2008-08-01 14:10:19.000000000 -0400 ++++ bodhi/tools/bodhi_client.py 2008-08-01 14:10:03.000000000 -0400 +@@ -27,7 +27,7 @@ + from optparse import OptionParser + from ConfigParser import ConfigParser + +-from fedora.tg.client import BaseClient, AuthError, ServerError ++from fedora.client import BaseClient, AuthError, ServerError + + __version__ = '$Revision: 1.1 $'[11:-2] + __description__ = 'Command line tool for interacting with Bodhi' +@@ -48,7 +48,7 @@ + } + if hasattr(opts, 'request') and getattr(opts, 'request'): + params['request'] = opts.request +- data = self.send_request('save', auth=True, input=params) ++ data = self.send_request('save', auth=True, req_params=params) + log.info(data['tg_flash']) + if data.has_key('update'): + log.info(data['update']) +@@ -65,7 +65,7 @@ + } + if hasattr(opts, 'request') and getattr(opts, 'request'): + params['request'] = opts.request +- data = self.send_request('save', auth=True, input=params) ++ data = self.send_request('save', auth=True, req_params=params) + log.info(data['tg_flash']) + if data.has_key('update'): + log.info(data['update']) +@@ -80,7 +80,7 @@ + args['package'] = package[0] + if args.has_key('mine'): + auth = True +- data = self.send_request('list', input=args, auth=auth) ++ data = self.send_request('list', req_params=args, auth=auth) + if data.has_key('tg_flash') and data['tg_flash']: + log.error(data['tg_flash']) + sys.exit(-1) +@@ -92,7 +92,7 @@ + + def delete(self, update): + params = { 'update' : update } +- data = self.send_request('delete', input=params, auth=True) ++ data = self.send_request('delete', req_params=params, auth=True) + log.info(data['tg_flash']) + + def __koji_session(self): +@@ -149,7 +149,7 @@ + 'karma' : opts.karma, + 'title' : update + } +- data = self.send_request('comment', input=params, auth=True) ++ data = self.send_request('comment', req_params=params, auth=True) + if data['tg_flash']: + log.info(data['tg_flash']) + if data.has_key('update'): +@@ -157,7 +157,7 @@ + + def request(self, opts, update): + params = { 'action' : opts.request, 'update' : update } +- data = self.send_request('request', input=params, auth=True) ++ data = self.send_request('request', req_params=params, auth=True) + log.info(data['tg_flash']) + if data.has_key('update'): + log.info(data['update']) +@@ -182,7 +182,7 @@ + yes = sys.stdin.readline().strip() + if yes.lower() in ('y', 'yes'): + log.info("Pushing!") +- self.send_request('admin/push/mash', auth=True, input={ ++ self.send_request('admin/push/mash', auth=True, req_params={ + 'updates' : [u['title'] for u in data['updates']] }) + + def parse_file(self,opts): +@@ -301,7 +301,7 @@ + (opts, args) = parser.parse_args() + setup_logger() + +- bodhi = BodhiClient(BODHI_URL, opts.username, None, opts.verbose) ++ bodhi = BodhiClient(BODHI_URL, username=opts.username, debug=opts.verbose) + + def verify_args(args): + if not args and len(args) != 1: diff --git a/bodhi.spec b/bodhi.spec index 56e5466..f4811be 100644 --- a/bodhi.spec +++ b/bodhi.spec @@ -3,12 +3,13 @@ Name: bodhi Version: 0.4.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A modular framework that facilitates publishing software updates Group: Applications/Internet License: GPLv2+ URL: https://hosted.fedoraproject.org/projects/bodhi Source0: bodhi-%{version}.tar.bz2 +Patch0: bodhi-%{version}-python-fedora-0.3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -44,6 +45,7 @@ updates for a software distribution. %prep %setup -q +%patch0 -b .python-fedora-0.3 rm -rf bodhi/tests bodhi/tools/test-bodhi.py %build @@ -76,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Aug 01 2008 Luke Macken - 0.4.10-4 +- Add a patch to fix the bodhi client for python-fedora 0.3 API changes + * Tue Feb 26 2008 Luke Macken - 0.4.10-3 - Add python-bugzilla to our server requirements