[geeqie/f13/master: 11/11] Merge branch 'master' into f13

[Michael Schwendt]

commit 4ea8caba3820ff392a6baf32fb0cdfed2f9e07f0
Merge: 5dff289 071762d
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sat Mar 5 11:16:45 2011 +0100

    Merge branch 'master' into f13
    
    Conflicts:
    	geeqie.spec

 geeqie-1.0-exif-filecache.patch |   12 +++++++++
 geeqie-1.0-lfs-autoconf.patch   |   13 +++++++++
 geeqie-1.0-sidecars-case.patch  |   26 +++++++++++++++++++
 geeqie.spec                     |   53 +++++++++++++++++++++++++++++++++++---
 4 files changed, 99 insertions(+), 5 deletions(-)
---
diff --cc geeqie.spec
index 1b86b4c,ddc5f35..e1e0da5
--- a/geeqie.spec
+++ b/geeqie.spec
@@@ -11,6 -11,15 +11,15 @@@ Group: User Interface/
  Source: http://downloads.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
  URL: http://geeqie.sourceforge.net/
+ 
+ # in upstream patch tracker
+ Patch0: geeqie-1.0-lfs-autoconf.patch
+ BuildRequires: autoconf
+ # reported upstream
+ Patch1: geeqie-1.0-exif-filecache.patch
 -# bz 632243, reported upstream
++# bz 632243 test
+ Patch2: geeqie-1.0-sidecars-case.patch
+ 
  BuildRequires: gtk2-devel
  BuildRequires: lcms-devel
  BuildRequires: exiv2-devel