From 0a9e4ad9bed448746adaf498f1e4718976459221 Mon Sep 17 00:00:00 2001 From: Joe VLcek Date: Mar 08 2012 17:59:13 +0000 Subject: Update to Sprint 080 --- diff --git a/.gitignore b/.gitignore index 146abef..98c9fe2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /aeolus-audrey-agent-0.4.0.tar.gz +/aeolus-audrey-agent-0.4.2.tar.gz diff --git a/aeolus-audrey-agent.spec b/aeolus-audrey-agent.spec index 73e4feb..d12245b 100644 --- a/aeolus-audrey-agent.spec +++ b/aeolus-audrey-agent.spec @@ -14,8 +14,8 @@ # limitations under the License. # Name: aeolus-audrey-agent -Version: 0.4.0 -Release: 10%{?dist} +Version: 0.4.2 +Release: 15%{?dist} Summary: The Aeolus Audrey Startup Agent Group: Applications/System @@ -23,11 +23,21 @@ License: ASL 2.0 URL: http://aeolusproject.org Source0: http://joev.fedorapeople.org/audrey-agent/aeolus-audrey-agent-%{version}.tar.gz +# All of these are required for building since during the build +# process "audrey --help" is executed to generate the man page. BuildRequires: help2man +BuildRequires: facter python-httplib2 python-oauth2 +%if (0%{?fedora} <= 14 || 0%{?rhel} <= 6) +BuildRequires: python-argparse +BuildRequires: python-setuptools +%endif Requires: facter python-httplib2 python-oauth2 +Requires: python-argparse %if (0%{?fedora} <= 14 || 0%{?rhel} <= 6) -Requires: python-argparse +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +Requires: python-argparse +Requires: python-setuptools %endif BuildArch: noarch @@ -48,8 +58,8 @@ rm -rf %{buildroot} mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_mandir}/man8 -# copy over the audrey startup agent bits -install audrey_startup.py %{buildroot}%{_bindir}/audrey +# copy over the audrey agent bits +install audrey_agent.py %{buildroot}%{_bindir}/audrey cp audrey.8 %{buildroot}%{_mandir}/man8 %files @@ -58,9 +68,16 @@ cp audrey.8 %{buildroot}%{_mandir}/man8 %doc COPYING %changelog -* Thu Jan 12 2012 Fedora Release Engineering - 0.4.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - +* Wed Dec 07 2011 Joe VLcek 0.4.0-14 +- Define BuildRoot to address RHEL5 rpmbuild incompatibility +* Tue Dec 06 2011 Joe VLcek 0.4.0-13 +- Made run with Python2.4 for RHEL5 compatibility +* Thu Nov 18 2011 Joe VLcek 0.4.0-12 +- Fixed Auto help file generation induced build failure +* Thu Nov 17 2011 Joe VLcek 0.4.0-11 +- Remove Auto help file generation as it is currently breakin the build +* Thu Nov 17 2011 Joe VLcek 0.4.0-10 +- Fix bz754769 fix user data parsing and log level * Tue Nov 09 2011 Joe VLcek 0.4.0-9 - Update the licensing information * Tue Nov 08 2011 Joe VLcek 0.4.0-8 diff --git a/sources b/sources index 7f414d9..2036ad0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0a212a8ff380f197251549ee8dec2e8d aeolus-audrey-agent-0.4.0.tar.gz +fd9a9d385a9d7435f94e0538f4e680d3 aeolus-audrey-agent-0.4.2.tar.gz