[tito/el5: 2/2] Merge branch 'master' into el5

[Devan Goodwin]

commit 4c37c2b69ae8a4a9fd6dd575fc1bbf9f68f443a4
Merge: 33eadd5 9f4f87a
Author: Devan Goodwin <dgoodwin at rm-rf.ca>
Date:   Wed Nov 16 16:33:17 2011 -0400

    Merge branch 'master' into el5
    
    Conflicts:
    	tito.spec

 .gitignore |    1 +
 sources    |    2 +-
 tito.spec  |   29 ++++++++++++++++++++++++-----
 3 files changed, 26 insertions(+), 6 deletions(-)
---
diff --cc tito.spec
index b6de526,9d4960e..264f692
--- a/tito.spec
+++ b/tito.spec
@@@ -35,14 -35,25 +35,12 @@@ git
  
  %build
  %{__python} setup.py build
 -# convert manages
 -a2x -d manpage -f manpage titorc.5.asciidoc
 -a2x -d manpage -f manpage tito.8.asciidoc
 -a2x -d manpage -f manpage tito.props.5.asciidoc
 -a2x -d manpage -f manpage releasers.conf.5.asciidoc
  
- 
  %install
  rm -rf $RPM_BUILD_ROOT
  %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
  rm -f $RPM_BUILD_ROOT%{python_sitelib}/*egg-info/requires.txt
 -# manpages
 -%{__mkdir_p} %{buildroot}%{_mandir}/man5
 -%{__mkdir_p} %{buildroot}%{_mandir}/man8
 -%{__gzip} -c titorc.5 > %{buildroot}/%{_mandir}/man5/titorc.5.gz
 -%{__gzip} -c tito.8 > %{buildroot}/%{_mandir}/man8/tito.8.gz
 -%{__gzip} -c tito.props.5 > %{buildroot}/%{_mandir}/man5/tito.props.5.gz
 -%{__gzip} -c releasers.conf.5 > %{buildroot}/%{_mandir}/man5/releasers.conf.5.gz
 -%{__gzip} -c build.py.props.5 > %{buildroot}/%{_mandir}/man5/build.py.props.5.gz
  
- 
  %clean
  rm -rf $RPM_BUILD_ROOT
  
@@@ -50,8 -61,12 +48,7 @@@
  %files
  %defattr(-,root,root,-)
  %doc README.mkd AUTHORS COPYING
 -%doc %{_mandir}/man5/titorc.5.gz
 -%doc %{_mandir}/man5/tito.props.5.gz
 -%doc %{_mandir}/man5/releasers.conf.5.gz
 -%doc %{_mandir}/man5/build.py.props.5.gz
 -%doc %{_mandir}/man8/tito.8.gz
  %{_bindir}/tito
- %{_bindir}/bump-version.pl
  %{_bindir}/tar-fixup-stamp-comment.pl
  %{_bindir}/test-setup-specfile.pl
  %{_bindir}/generate-patches.pl