[libgee: 2/2] Prepare for building libgee 0.5.3 against newer g-o-i Update timestamp from the previous build and e

[Michel Alexandre Salim]

commit 8ea855eb5e693eaee2e914010b964a9cce4d1b5e
Merge: 0a7c3a0 927b3a0
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Thu Sep 23 08:49:59 2010 +0200

    Prepare for building libgee 0.5.3 against newer g-o-i
    Update timestamp from the previous build and explicitly declare g-o-i rebuild
      in %%changelog

 libgee.spec |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --cc libgee.spec
index cb37649,bd9f4fa..9323053
--- a/libgee.spec
+++ b/libgee.spec
@@@ -96,8 -87,8 +96,10 @@@ find $RPM_BUILD_ROOT -name '*.la' -exe
  
  
  %changelog
- * Fri Sep 17 2010 Michel Salim <salimma at fedoraproject.org> - 0.5.3-1
 -* Wed Sep 22 2010 Matthias Clasen <mclasen at redhat.com> - 0.5.2-3
++<<<<<<< HEAD
++* Thu Sep 23 2010 Michel Salim <salimma at fedoraproject.org> - 0.5.3-1
 +- Update to 0.5.3
+ - Rebuild against newer gobject-introspection
  
  * Wed Aug 25 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-2
  - Add BR on gobject-introspection-devel.