[openslide/el5: 11/11] Merge branch 'el6' into el5

[Adam Goode]

commit 070668726e86194b8c0a536d132ad1c1790d9bd2
Merge: 36dbdad bb2f3e8
Author: Adam Goode <adam at spicenitz.org>
Date:   Mon Jan 16 21:46:56 2012 -0500

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore
    	openslide.spec
    	sources

 .gitignore     |    2 +-
 openslide.spec |   26 +++++++++++++++++++++++++-
 sources        |    2 +-
 3 files changed, 27 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index a3d7b39,eeaf53a..ae83fcd
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,1 @@@
- /openslide-3.2.4.tar.gz
 -/openslide-3.2.5.tar.xz
++/openslide-3.2.5.tar.gz
diff --cc openslide.spec
index c11342d,95f2013..b1ffaf7
--- a/openslide.spec
+++ b/openslide.spec
@@@ -82,6 -78,21 +82,18 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
+ * Mon Jan 16 2012 Adam Goode <adam at spicenitz.org> - 3.2.5-1
+ - New upstream release
+    + Support for MIRAX 1.03 files
+    + openslide_read_region now works for large dimensions
+    + quickhash-1 is disabled for unusual TIFFs where it is very slow
+ 
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.4-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
+ * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 3.2.4-2
+ - Rebuild for new libpng
+ 
 -* Fri Aug 12 2011 Adam Goode <adam at spicenitz.org> - 3.2.4-1.1
 -- Restore missing clean section (again)
 -
  * Fri Aug 12 2011 Adam Goode <adam at spicenitz.org> - 3.2.4-1
  - New upstream release, see http://github.com/openslide/openslide/blob/master/CHANGELOG.txt
  
diff --cc sources
index 33cbb26,70f1b54..e34ba6f
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,1 @@@
- 5ea063992e8e67f3a3696010746a7c37  openslide-3.2.4.tar.gz
 -da871b1812422113e76789fc520f2765  openslide-3.2.5.tar.xz
++017e19791f96d7712a765e58736e7fc0  openslide-3.2.5.tar.gz