[python-reportlab/el6/master: 11/11] Merge remote branch 'origin/el5/master' into el6

[Konstantin Ryabitsev]

commit 944483d2d5825c5db91c9aec2dfb44d6a5661326
Merge: b60644c c9ee1a3
Author: Konstantin Ryabitsev <icon at fedoraproject.org>
Date:   Mon Jan 31 09:50:39 2011 -0500

    Merge remote branch 'origin/el5/master' into el6
    
    Conflicts:
    	.gitignore
    	python-reportlab.spec
    	sources

 .gitignore                                         |    2 +-
 python-reportlab.spec                              |   42 ++++++++++++-------
 ...ons.patch => reportlab-2.5-font-locations.patch |   14 ++++---
 sources                                            |    2 +-
 4 files changed, 36 insertions(+), 24 deletions(-)
---
diff --cc .gitignore
index 824ad66,cd5e0f7..608562c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--ReportLab_2_3.tar.gz
+ /reportlab-2.5.tar.gz
diff --cc python-reportlab.spec
index 3956991,0f96180..5c7a7bb
--- a/python-reportlab.spec
+++ b/python-reportlab.spec
@@@ -70,6 -72,17 +70,16 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
+ * Fri Jan 28 2011 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.5-3
 -- Require bitstream-vera-fonts for EPEL5
 -- Require python-setuptools and generate egg-info separately
++- Require bitstream-vera-fonts for EPEL6
+ 
+ * Thu Jan 06 2011 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.5-2
+ - Update to version 2.5 of reportlab.
+ - Remove tabs in specfile.
+ 
+ * Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 2.3-3
+ - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+ 
  * Mon Nov 23 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.3-2
  - Do not bundle fonts
  - Point the config to Fedora's font locations