From b2dd04d12d651d222c18179a81bd9f729c5adf16 Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Aug 14 2008 06:09:40 +0000 Subject: 0.5.0, the latest release --- diff --git a/bodhi-0.4.10-python-fedora-0.3.patch b/bodhi-0.4.10-python-fedora-0.3.patch deleted file mode 100644 index e67626f..0000000 --- a/bodhi-0.4.10-python-fedora-0.3.patch +++ /dev/null @@ -1,83 +0,0 @@ ---- 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 f4811be..d9c60cd 100644 --- a/bodhi.spec +++ b/bodhi.spec @@ -2,21 +2,23 @@ %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} Name: bodhi -Version: 0.4.10 -Release: 4%{?dist} +Version: 0.5.0 +Release: 7%{?dist} Summary: A modular framework that facilitates publishing software updates Group: Applications/Internet License: GPLv2+ -URL: https://hosted.fedoraproject.org/projects/bodhi +URL: https://fedorahosted.org/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 -BuildRequires: python-setuptools-devel TurboGears python-genshi python-elixir +BuildRequires: python-setuptools-devel +BuildRequires: python-devel +BuildRequires: TurboGears %description -Bodhi is a modular framework that facilitates the process of publishing +Bodhi is a web application that facilitates the process of publishing updates for a software distribution. A modular piece of the Fedora Infrastructure stack @@ -24,20 +26,34 @@ A modular piece of the Fedora Infrastructure stack * Creates the update repositories using Mash, which composes a repository based on tagged builds in Koji. + %package client Summary: Bodhi Client Group: Applications/Internet Requires: python-simplejson python-fedora koji yum -%description client +%description client Client tools for interacting with bodhi %package server Summary: A modular framework that facilitates publishing software updates Group: Applications/Internet -Requires: TurboGears createrepo python-TurboMail intltool mash cvs python-fedora +Requires: TurboGears +Requires: python-TurboMail +Requires: intltool +Requires: mash +Requires: cvs +Requires: koji +Requires: python-fedora Requires: python-bugzilla +Requires: python-imaging +Requires: python-crypto +Requires: python-turboflot +Requires: python-tgcaptcha +Requires: python-decorator +Requires: mod_wsgi + %description server Bodhi is a modular framework that facilitates the process of publishing @@ -45,31 +61,44 @@ updates for a software distribution. %prep %setup -q -%patch0 -b .python-fedora-0.3 rm -rf bodhi/tests bodhi/tools/test-bodhi.py %build -%{__python} setup.py build --install-conf=%{_sysconfdir} \ - --install-data=%{_datadir} +%{__python} setup.py build --install-data=%{_datadir} %install -rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install --skip-build --install-conf=%{_sysconfdir} \ +%{__rm} -rf %{buildroot} +%{__python} setup.py install -O1 --skip-build \ --install-data=%{_datadir} --root %{buildroot} -%{__install} -D bodhi/tools/bodhi_client.py $RPM_BUILD_ROOT/usr/bin/bodhi -chmod +x $RPM_BUILD_ROOT/%{_datadir}/%{name}/bodhi/tools/{bodhi_client,init,dev_init,pickledb}.py + +%{__mkdir_p} %{buildroot}/var/lib/bodhi +%{__mkdir_p} %{buildroot}%{_sysconfdir}/httpd/conf.d +%{__mkdir_p} %{buildroot}%{_sysconfdir}/bodhi +%{__mkdir_p} %{buildroot}%{_datadir}/%{name} +%{__mkdir_p} -m 0755 %{buildroot}/%{_localstatedir}/log/bodhi + +%{__install} -m 640 apache/%{name}.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf +%{__install} -m 640 %{name}.cfg %{buildroot}%{_sysconfdir}/%{name}/ +%{__install} -m 640 %{name}/config/*mash* %{buildroot}%{_sysconfdir}/%{name}/ +%{__install} apache/%{name}.wsgi %{buildroot}%{_datadir}/%{name}/%{name}.wsgi %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %files server %defattr(-,root,root,-) %doc README COPYING -%{_datadir}/%{name} -%{_bindir}/start-bodhi -%config(noreplace) %{_sysconfdir}/%{name}.cfg +%{python_sitelib}/%{name}/ +%{_bindir}/start-%{name} +%{_bindir}/%{name}-* +%{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info/ +%{_sysconfdir}/httpd/conf.d/bodhi.conf +%attr(-,apache,root) %{_datadir}/%{name} +%attr(-,apache,root) %config(noreplace) %{_sysconfdir}/bodhi/* +%attr(-,apache,root) %{_localstatedir}/log/bodhi + %files client %doc COPYING README @@ -78,8 +107,14 @@ 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 +* Sun Jul 06 2008 Luke Macken - 0.5.0-7 +- Latest upstream release + +* Thu Jun 12 2008 Todd Zullinger - 0.4.10-5 +- update URL to point to fedorahosted.org + +* Fri Apr 04 2008 Luke Macken - 0.4.10-4 +- Add python-tgcaptcha to our server requirements * Tue Feb 26 2008 Luke Macken - 0.4.10-3 - Add python-bugzilla to our server requirements diff --git a/sources b/sources index 72c095c..9ba25af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b567b445f7624ad5392c6ace48b767a9 bodhi-0.4.10.tar.bz2 +1cba513eeac3e7e2a506783e1f03c8ba bodhi-0.5.0.tar.bz2