diff options
Diffstat (limited to 'misc/bcfg2.spec')
| -rw-r--r-- | misc/bcfg2.spec | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 3539b0dec..357afed4e 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -19,7 +19,7 @@ # # Don't forget to change the Release: tag below to something like 0.1 #%%global _rc 1 -#%%global _pre 2 +%global _pre pre1 %global _nightly 1 %global _date %(date +%Y%m%d) %global _pre_rc %{?_pre:pre%{_pre}}%{?_rc:rc%{_rc}} @@ -48,7 +48,7 @@ Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}%{?_pre_rc}.t Source1: http://www.w3.org/2001/XMLSchema.xsd %if %{?rhel}%{!?rhel:10} <= 5 || 0%{?suse_version} # EL5 and OpenSUSE require the BuildRoot tag -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}%{?_pre_rc}-%{release}-root-%(%{__id_u} -n) %endif BuildArch: noarch @@ -258,10 +258,8 @@ Group: System Environment/Daemons Requires: bcfg2 = %{version}-%{release} Requires: bcfg2-server = %{version}-%{release} -# cherrypy 3.3 actually doesn't exist yet, but 3.2 has bugs that -# prevent it from working: -# https://bitbucket.org/cherrypy/cherrypy/issue/1154/assertionerror-in-recv-when-ssl-is-enabled -Requires: python-cherrypy > 3.3 +# https://bitbucket.org/cherrypy/cherrypy/issue/1068/file-upload-crashes-when-using-https +Requires: python-cherrypy >= 3.2.6 %description server-cherrypy Bcfg2 helps system administrators produce a consistent, reproducible, |