[vips/f14: 9/9] Merge branch 'master' into f14

[Adam Goode]

commit c95a56c511c2b4c89197d997664425be4ba184fe
Merge: 99774ad 23ac4ed
Author: Adam Goode <adam at spicenitz.org>
Date:   Fri Aug 12 14:08:43 2011 -0400

    Merge branch 'master' into f14
    
    Conflicts:
    	vips.spec

 .gitignore |    3 +-
 sources    |    2 +-
 vips.spec  |   66 ++++++++++++++++++++++++++++++++++++++++-------------------
 3 files changed, 47 insertions(+), 24 deletions(-)
---
diff --cc vips.spec
index 95269eb,c6df9fb..8b07ac6
--- a/vips.spec
+++ b/vips.spec
@@@ -131,15 -135,29 +135,35 @@@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc
  %doc doc/html doc/pdf COPYING
  
  
- 
  %changelog
+ * Fri Aug 12 2011 Adam Goode <adam at spicenitz.org> - 7.24.7-2
+ - Clean up Requires and BuildRequires
+ 
+ * Wed Aug 10 2011 Adam Goode <adam at spicenitz.org> - 7.24.7-1
+ - New upstream release
+ 
+ * Mon Feb 14 2011 Adam Goode <adam at spicenitz.org> - 7.24.2-1
+ - New upstream release
+    * Run-time code generation, for 4x speedup in some operations
+    * Open via disc mode, saving memory
+    * FITS supported
+    * Improved TIFF and JPEG load
+ 
+ * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.22.2-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
+ * Wed Sep 29 2010 jkeating - 7.22.2-3
+ - Rebuilt for gcc bug 634757
+ 
+ * Mon Sep 20 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 7.22.2-2
+ - rebuild against ImageMagick
+ 
 +* Tue Oct 05 2010 jkeating - 7.22.2-1.2
 +- Rebuilt for gcc bug 634757
 +
 +* Fri Sep 17 2010 Rex Dieter <rdieter at fedoraproject.org> - 7.22.2-1.1
 +- rebuild (ImageMagick)
 +
  * Fri Aug  6 2010 Adam Goode <adam at spicenitz.org> - 7.22.2-1
  - New upstream release (a few minor fixes)