[libgexiv2/f14/master: 4/4] Update f14 to 0.2.2

[Ankur Sinha]

commit 63e6c89be9bb559554476fb1b532c0e37272376c
Merge: 1989c23 f9c772d
Author: Ankur Sinha <ankursinha AT fedoraproject DOT org>
Date:   Tue Jan 4 13:52:15 2011 +0530

    Update f14 to 0.2.2

 .gitignore                    |    4 ++++
 gexiv2-0.2.1-exiv2-0.21.patch |   35 +++++++++++++++++++++++++++++++++++
 libgexiv2.spec                |   16 ++++++++++++++--
 sources                       |    2 +-
 4 files changed, 54 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 74f37dd,bcb6e1d..c963910
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,4 +1,7 @@@
  libgexiv2-0.1.0.tar.gz
  libgexiv2-0.1.90.tar.gz
  /libgexiv2-0.2.0.tar.bz2
++<<<<<<< HEAD
++=======
+ /libgexiv2-0.2.2.tar.bz2
++>>>>>>> master
diff --cc libgexiv2.spec
index 367edcf,4e8973b..c0cddb5
--- a/libgexiv2.spec
+++ b/libgexiv2.spec
@@@ -69,12 -74,13 +74,19 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
++* Tue Jan 04 2011 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.2.2-1
++- merge with master to update f14
++
+ * Sat Jan 01 2011 Rex Dieter <rdieter at fedoraproject.org> - 0.2.2-1
+ - 0.2.2
+ - exiv2-0.21 patch
+ 
  * Tue Aug 24 2010 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.2.0-1
- - update to latest release
+ - update to latest upstream release
  
 +* Sun Aug 08 2010 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.1.90-2
 +- Uploaded new src
 +
  * Sun Aug 08 2010 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.1.90-1
  - update to latest upstream release