[papyon/f13/master: 10/10] - Update to 0.5.0. - Add BR on farsight2-python & gst-python.

[Brian Pepple]

commit d3971a36ee90d5aa82307d400c82213fcb1859c0
Merge: 44209cc 8e175da
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Fri Sep 17 20:32:56 2010 -0400

    - Update to 0.5.0.
    - Add BR on farsight2-python & gst-python.

 .gitignore  |    5 +++++
 papyon.spec |   10 +++++++++-
 sources     |    2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 4c62555,a0e4dd8..afae9a8
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,6 @@@
  papyon-0.4.9.tar.gz
++<<<<<<< HEAD
++=======
+ papyon-0.5.0.tar.gz
++>>>>>>> f14
++/papyon-0.5.0.tar.gz
diff --cc papyon.spec
index 7740017,f1edc0f..2531219
--- a/papyon.spec
+++ b/papyon.spec
@@@ -57,6 -61,13 +61,10 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 -* Mon Aug 16 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-1
++* Fri Sep 17 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.5.0-1
+ - Update to 0.5.0.
+ - Add BR on farsight2-python & gst-python.
+ 
 -* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.4.9-2
 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 -
  * Fri Jul  9 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.4.9-1
  - Update to 0.4.9.