diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-10-28 09:26:42 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-10-28 09:26:42 -0400 |
| commit | 56ed0fffa88e84dc6845202d58e91bb90641b1e2 (patch) | |
| tree | 1ab62bcdd03776e2bad23541d36fadeb6f96e910 /misc | |
| parent | 99c5e5ca3f834bd1d42b280eb03c73cfcf7c52d8 (diff) | |
| parent | cde36fc9d16b7e8722d1baf7648970baca6fbdda (diff) | |
| download | bcfg2-56ed0fffa88e84dc6845202d58e91bb90641b1e2.tar.gz bcfg2-56ed0fffa88e84dc6845202d58e91bb90641b1e2.tar.bz2 bcfg2-56ed0fffa88e84dc6845202d58e91bb90641b1e2.zip | |
Merge branch 'maint'
Conflicts:
misc/bcfg2.spec
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/bcfg2.spec | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 6c504c0d8..21516c0ed 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -20,13 +20,11 @@ # Don't forget to change the Release: tag below to something like 0.1 #%%global _rc 1 #%%global _pre 2 -%global _nightly 1 -%global _date %(date +%Y%m%d) -%global _pre_rc %{?_pre:pre%{_pre}}%{?_rc:rc%{_rc}} +%global _pre_rc %{?_pre:.pre%{_pre}}%{?_rc:.rc%{_rc}} Name: bcfg2 -Version: 1.4.0 -Release: 0.1.%{?_nightly:nightly.%{_date}}%{?_pre_rc}%{?dist} +Version: 1.3.2 +Release: 2%{?_pre_rc}%{?dist} Summary: A configuration management system %if 0%{?suse_version} @@ -37,7 +35,7 @@ Group: Applications/System %endif License: BSD URL: http://bcfg2.org -Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-%{version}%{?_pre_rc}.tar.gz +Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}%{?_pre_rc}.tar.gz # Used in %%check Source1: http://www.w3.org/2001/XMLSchema.xsd %if %{?rhel}%{!?rhel:10} <= 5 || 0%{?suse_version} @@ -49,6 +47,7 @@ BuildArch: noarch BuildRequires: python BuildRequires: python-devel BuildRequires: python-lxml +BuildRequires: python-boto %if 0%{?suse_version} BuildRequires: python-M2Crypto BuildRequires: python-Genshi @@ -418,7 +417,6 @@ awk ' # Fixup some paths %{__perl} -pi -e 's@/etc/default@%{_sysconfdir}/sysconfig@g' tools/bcfg2-cron - %{__perl} -pi -e 's@/usr/lib/bcfg2@%{_libexecdir}@g' debian/bcfg2.cron.daily %{__perl} -pi -e 's@/usr/lib/bcfg2@%{_libexecdir}@g' debian/bcfg2.cron.hourly |