[telepathy-glib/f13/master: 28/28] merge changes

[Brian Pepple]

commit 96fdede2161f553e69b6f6f6abf9db022633bed6
Merge: 47f981f 147ba1f
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Sun Feb 20 15:26:37 2011 -0500

    merge changes

 .gitignore                            |    7 +++++++
 sources                               |    2 +-
 telepathy-glib-broken-pkgconfig.patch |   20 ++++++++++----------
 telepathy-glib.spec                   |   29 ++++++++++++++++++++++-------
 4 files changed, 40 insertions(+), 18 deletions(-)
---
diff --cc .gitignore
index fb0ee4f,c12a931..86945a9
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,6 +1,8 @@@
 +telepathy-glib-0.10.7.tar.gz
+ telepathy-glib-0.11.11.tar.gz
+ telepathy-glib-0.11.12.tar.gz
+ telepathy-glib-0.11.13.tar.gz
+ /telepathy-glib-0.11.14.tar.gz
+ /telepathy-glib-0.11.15.tar.gz
+ /telepathy-glib-0.11.16.tar.gz
++
diff --cc telepathy-glib.spec
index deb298d,1a7313d..313c4de
--- a/telepathy-glib.spec
+++ b/telepathy-glib.spec
@@@ -94,11 -118,44 +96,15 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 -* Tue Oct 12 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.11.16-1
++* Sun Feb 20 2011 Brian Pepple <bpepple at fedoraproject.org> - 0.11.16-1
+ - Update to 0.11.16.
 -
 -* Mon Sep 13 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.11.15-1
 -- Update to 0.11.15.
 -
 -* Wed Aug 25 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.11.14-1
 -- Update to 0.11.14.
 -
 -* Tue Aug 17 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.11.13-1
 -- Update to 0.11.13.
 -- Enable vala bindings. (#619137)
 -
 -* Wed Aug 11 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.11.12-1
 -- Update to 0.11.12.
 -
 -* Mon Jul 26 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.11.11-1
 -- Update to 0.11.11.
 -
 -* Mon Jul 12 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.11.10-1
 -- Update to 0.11.10.
 -
 -* Tue Jun 22 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.11.8-1
 -- Update to 0.11.8.
 -- Enable gobject introspection.
+ - Bump min version of glib required.
+ 
 -* Mon Jun 14 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.11.7-1
 -- Update to 0.11.7.
 -
 -* Mon Jun  7 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.11.6-1
 -- Update to 0.11.6.
 -
 -* Mon May 31 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.11.5-2
 -- Enable checks.
 +* Tue Jun 22 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.10.7-1
 +- Update to 0.10.7.
  
 -* Mon May 10 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.11.5-1
 -- Update to 0.11.5.
 +* Tue May 25 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.10.6-1
 +- Update to 0.10.6.
  
  * Wed Apr 28 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.10.5-1
  - Update to 0.10.5.