[vala: 11/12] Merge branch 'master' of ssh://pkgs.fedoraproject.org/vala

[Michel Alexandre Salim]

commit 0acbc1a230baa985dc6d0e1279b2c2b637f906c0
Merge: 69d3433 cea1a75
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sun Sep 12 15:46:30 2010 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/vala
    
    Conflicts:
    	.gitignore
    	sources
    	vala.spec

 vala.spec |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --cc vala.spec
index ebc897d,0ce3a3d..cfc7ba8
--- a/vala.spec
+++ b/vala.spec
@@@ -219,11 -209,10 +214,15 @@@ cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_emac
  
  
  %changelog
 +* Sun Sep 12 2010 Michel Salim <salimma at fedoraproject.org> - 0.9.8-1
 +- Update to 0.9.8
 +- Make -doc subpackage noarch
 +- Mark -doc files as %%doc
 +
+ * Wed Aug 25 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.9.7-1
+ - Update to 0.9.7.
+ - Remove clean section & buildroot. No longer needed.
+ 
  * Mon Aug  9 2010 Michel Salim <salimma at fedoraproject.org> - 0.9.5-1
  - Update to 0.9.5