[folks/f16: 7/7] Fix merge conflicts

[Brian Pepple]

commit adb3696586a3ba3bb3f4cb33a4a38af2c9d1641b
Merge: 98afc07 cd7fc4c
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Mon Sep 19 11:41:02 2011 -0400

    Fix merge conflicts

 .gitignore                   |   21 +--------------------
 folks-typelib.patch          |   12 ------------
 folks.spec                   |   26 +++++++++++++-------------
 reentrancy-is-the-suck.patch |   31 -------------------------------
 sources                      |    3 ++-
 5 files changed, 16 insertions(+), 77 deletions(-)
---
diff --cc .gitignore
index fa70c4e,5d014c3..31d3899
--- a/.gitignore
+++ b/.gitignore
@@@ -1,20 -1,21 +1,1 @@@
--/folks-0.1.14.tar.bz2
--/folks-0.1.14.1.tar.bz2
--/folks-0.1.15.tar.bz2
--/folks-0.1.16.tar.bz2
--/folks-0.1.17.tar.bz2
--/folks-0.2.0.tar.bz2
--/folks-0.3.1.tar.bz2
--/folks-0.2.1.tar.bz2
--/folks-0.3.2.tar.bz2
--/folks-0.3.3.tar.bz2
--/folks-0.3.4.tar.bz2
--/folks-0.3.6.tar.bz2
--/folks-0.4.0.tar.bz2
--/folks-0.4.1.tar.bz2
--/folks-0.4.2.tar.bz2
--/folks-0.5.2.tar.bz2
--/folks-0.6.0.tar.xz
--/folks-0.6.1.tar.xz
--/folks-0.6.2.tar.xz
--/folks-0.6.2.1.tar.xz
+ /folks-0.6.3.tar.xz
diff --cc folks.spec
index c65b188,0762410..a9e3c63
--- a/folks.spec
+++ b/folks.spec
@@@ -50,13 -47,7 +47,8 @@@ developing applications that use %{name
  
  %prep
  %setup -q
- %patch0 -p1
  
- autoreconf -i -f
- # Mistakenly distributed
- # https://bugzilla.gnome.org/show_bug.cgi?id=659095
- rm folks/Folks-*.typelib
 +
  %build
  %configure --disable-static --enable-eds-backend
  make %{?_smp_mflags} V=1
@@@ -95,13 -90,11 +91,17 @@@ find $RPM_BUILD_ROOT -name '*.la' -exe
  - Really fix the typelib to embed the right .so file
  
  * Thu Sep  8 2011 Matthias Clasen <mclasen at redhat.com> - 1:0.6.2.1-1
 +- Really fix the reentrancy problem, by using 0.6.2.1
 +
 +* Thu Sep  8 2011 Matthias Clasen <mclasen at redhat.com> - 1:0.6.2-2
 +- Fix a reentrancy problem that causes gnome-shell to crash
 +
 +* Thu Sep  8 2011 Matthias Clasen <mclasen at redhat.com> - 1:0.6.2-1
+ - Update to 0.6.2.1
+ 
+ * Thu Sep  8 2011 Brian Pepple <bpepple at fedoraproject.org> - 1:0.6.2-1
  - Update to 0.6.2
+ - Use old libgee api.
  
  * Wed Sep  7 2011 Matthias Clasen <mclasen at redhat.com> - 1:0.6.1-4
  - Try again
diff --cc sources
index 28f40f9,bc46491..3a0995b
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,2 @@@
- 1c1771a9424a4f231cd020a7deeb8679  folks-0.6.2.1.tar.xz
+ aac3977c970d6b38548620bcdbc79ae5  folks-0.6.3.tar.xz
++