diff --git a/bodhi-temp-client-only.patch b/bodhi-temp-client-only.patch deleted file mode 100644 index be25a3b..0000000 --- a/bodhi-temp-client-only.patch +++ /dev/null @@ -1,72 +0,0 @@ -Index: bodhi-0.7.5/setup.py -=================================================================== ---- bodhi-0.7.5.orig/setup.py -+++ bodhi-0.7.5/setup.py -@@ -1,10 +1,9 @@ - #!/usr/bin/env python - # - # $Id: $ --__requires__='TurboGears[future]' -+#__requires__='TurboGears[future]' - - from setuptools import setup, find_packages --from turbogears.finddata import find_package_data - import os - import re - import glob -@@ -19,14 +18,13 @@ from distutils.dep_util import newer - from setuptools.command.install import install as _install - from setuptools.command.install_lib import install_lib as _install_lib - --from turbogears.finddata import find_package_data, standard_exclude, \ -- standard_exclude_directories -- -+#from turbogears.finddata import find_package_data, standard_exclude, \ -+# standard_exclude_directories - - excludeFiles = ['*.cfg.in'] --excludeFiles.extend(standard_exclude) -+#excludeFiles.extend(standard_exclude) - excludeDataDirs = ['bodhi/static', 'comps'] --excludeDataDirs.extend(standard_exclude_directories) -+#excludeDataDirs.extend(standard_exclude_directories) - - poFiles = filter(os.path.isfile, glob.glob('po/*.po')) - -@@ -138,11 +136,11 @@ data_files = [ - for langfile in filter(os.path.isfile, glob.glob('locale/*/*/*')): - data_files.append((os.path.dirname(langfile), [langfile])) - --package_data = find_package_data(where='bodhi', -- package='bodhi', -- exclude=excludeFiles, -- exclude_directories=excludeDataDirs) --package_data['bodhi.config'].append('app.cfg') -+#package_data = find_package_data(where='bodhi', -+# package='bodhi', -+# exclude=excludeFiles, -+# exclude_directories=excludeDataDirs) -+#package_data['bodhi.config'].append('app.cfg') - - - from bodhi.release import NAME, VERSION, DESCRIPTION -@@ -162,8 +160,8 @@ setup( - 'install_data': InstallData, - }, - install_requires = [ -- "TurboGears >= 1.0", -- "TurboMail", -+ #"TurboGears >= 1.0", -+ #"TurboMail", - "python_fedora", - "markdown", - ], -@@ -171,7 +169,7 @@ setup( - data_files = data_files, - zip_safe = False, - packages = find_packages(), -- package_data = package_data, -+ #package_data = package_data, - keywords = [ - 'turbogears.app', - ], diff --git a/bodhi.spec b/bodhi.spec index 1f9d27f..0c2260a 100644 --- a/bodhi.spec +++ b/bodhi.spec @@ -3,13 +3,12 @@ Name: bodhi Version: 0.7.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A modular framework that facilitates publishing software updates Group: Applications/Internet License: GPLv2+ URL: https://fedorahosted.org/bodhi Source0: bodhi-%{version}.tar.bz2 -Patch0: bodhi-temp-client-only.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -17,10 +16,8 @@ BuildArch: noarch BuildRequires: python-setuptools BuildRequires: python-setuptools-devel BuildRequires: python-devel - -# Disable the following until they are built for python-2.7 -#BuildRequires: TurboGears -#BuildRequires: python-TurboMail +BuildRequires: TurboGears +BuildRequires: python-TurboMail BuildRequires: python-bugzilla BuildRequires: python-fedora BuildRequires: yum koji @@ -72,7 +69,7 @@ updates for a software distribution. %prep %setup -q -%patch0 -p1 -b .temporary + rm -rf bodhi/tests bodhi/tools/test-bodhi.py %build @@ -122,6 +119,9 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py %changelog +* Wed Aug 04 2010 Orcan Ogetbil - 0.7.7-2 +- Reenable the TurboGears bits + * Tue Aug 03 2010 Luke Macken - 0.7.7-1 - 0.7.7 release