[openslide/el5/master: 2/2] Merge branch 'master' into el5

[Adam Goode]

commit 6ffb221fe771049ac227ee82b92f638c1edf78f5
Merge: 8b67874 d324c0f
Author: Adam Goode <adam at spicenitz.org>
Date:   Wed Sep 15 14:59:07 2010 -0400

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

 .gitignore     |    2 +-
 openslide.spec |   11 +++++++----
 sources        |    2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 331aa00,c642c23..bfa422c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
- openslide-3.2.2.tar.gz
 -openslide-3.2.2.tar.xz
 -/openslide-3.2.3.tar.xz
++/openslide-3.2.3.tar.gz
diff --cc openslide.spec
index 3939886,1dfa19c..e3c3fe7
--- a/openslide.spec
+++ b/openslide.spec
@@@ -5,9 -5,8 +5,9 @@@ Summary:	C library for reading virtual 
  
  Group:		System Environment/Libraries
  License:	LGPLv2
- URL:		http://openslide.cs.cmu.edu/
- Source0:	%{url}download/%{name}-%{version}.tar.gz
+ URL:		http://openslide.org/
 -Source0:	http://github.com/downloads/%{name}/%{name}/%{name}-%{version}.tar.xz
++Source0:	http://github.com/downloads/%{name}/%{name}/%{name}-%{version}.tar.gz
 +BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildRequires:	glib2-devel openjpeg-devel libtiff-devel
  BuildRequires:	libjpeg-devel pkgconfig cairo-devel libpng-devel
diff --cc sources
index 5698760,ca278e4..c32678b
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,1 @@@
- b5a2f7837ebc9616fa09930957708b6b  openslide-3.2.2.tar.gz
 -6a5e0144a936f59a34d51d8f163cc90f  openslide-3.2.3.tar.xz
++514e8d32710cf86e112720ecf09441a9  openslide-3.2.3.tar.gz