[python-reportlab/f14/master] Update to version 2.5 of reportlab.

Konstantin Ryabitsev icon at fedoraproject.org
Thu Jan 6 16:23:30 UTC 2011


commit edcb76cbdbb009a6f8c56073ca27d1ad580cdb13
Author: Konstantin Ryabitsev <icon at fedoraproject.org>
Date:   Thu Jan 6 11:22:58 2011 -0500

    Update to version 2.5 of reportlab.

 .gitignore                                         |    1 +
 python-reportlab.spec                              |   10 +++++-----
 ...ons.patch => reportlab-2.5-font-locations.patch |   12 +++++++-----
 sources                                            |    2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 824ad66..cd5e0f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 ReportLab_2_3.tar.gz
+/reportlab-2.5.tar.gz
diff --git a/python-reportlab.spec b/python-reportlab.spec
index 45e04bd..3342368 100644
--- a/python-reportlab.spec
+++ b/python-reportlab.spec
@@ -1,15 +1,15 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		python-reportlab
-Version:	2.3
-Release:	3%{?dist}
+Version:	2.5
+Release:	1%{?dist}
 Summary:	Python PDF generation library
 
 Group:		Development/Libraries
 License:	BSD
 URL:		http://www.reportlab.org/
-Source0:	http://www.reportlab.org/ftp/ReportLab_2_3.tar.gz
-Patch0:     reportlab-2.3-font-locations.patch
+Source0:	http://www.reportlab.org/ftp/reportlab-%{version}.tar.gz
+Patch0:     reportlab-%{version}-font-locations.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,7 +32,7 @@ Contains the documentation for ReportLab.
 
 
 %prep
-%setup -q -n ReportLab_2_3
+%setup -q -n reportlab-%{version}
 %patch0 -p1 -b .fonts
 # clean up hashbangs from libraries
 find src -name '*.py' | xargs sed -i -e '/^#!\//d'
diff --git a/reportlab-2.3-font-locations.patch b/reportlab-2.5-font-locations.patch
similarity index 90%
rename from reportlab-2.3-font-locations.patch
rename to reportlab-2.5-font-locations.patch
index d819492..0ddb62d 100644
--- a/reportlab-2.3-font-locations.patch
+++ b/reportlab-2.5-font-locations.patch
@@ -1,6 +1,7 @@
---- ReportLab_2_3.orig/src/reportlab/rl_config.py	2008-12-12 12:55:22.000000000 -0500
-+++ ReportLab_2_3/src/reportlab/rl_config.py	2009-11-23 16:14:45.839728088 -0500
-@@ -41,25 +41,7 @@
+diff -ur reportlab-2.5.orig/src/reportlab/rl_config.py reportlab-2.5/src/reportlab/rl_config.py
+--- reportlab-2.5.orig/src/reportlab/rl_config.py	2010-09-30 07:27:09.000000000 -0400
++++ reportlab-2.5/src/reportlab/rl_config.py	2011-01-05 16:12:33.906363563 -0500
+@@ -49,25 +49,7 @@
  
  # places to look for T1Font information
  T1SearchPath =  (
@@ -27,13 +28,14 @@
                  '%(REPORTLAB_DIR)s/fonts',              #special
                  '%(REPORTLAB_DIR)s/../fonts',           #special
                  '%(REPORTLAB_DIR)s/../../fonts',        #special
-@@ -68,43 +50,17 @@
+@@ -76,44 +58,17 @@
  
  # places to look for TT Font information
  TTFSearchPath = (
 -                'c:/winnt/fonts',
 -                'c:/windows/fonts',
 -                '/usr/lib/X11/fonts/TrueType/',
+-                '/usr/share/fonts/truetype',
 +                '/usr/share/fonts/dejavu',
 +                '/usr/share/fonts',
                  '%(REPORTLAB_DIR)s/fonts',      #special
@@ -70,7 +72,7 @@
 -                  'C:\\Program Files\\Adobe\\Acrobat 6.0\\Resource\\CMap',
 -                  'C:\\Program Files\\Adobe\\Acrobat 5.0\\Resource\\CMap',
 -                  'C:\\Program Files\\Adobe\\Acrobat 4.0\\Resource\\CMap',
-+                  '/usr/share/ghostscript/8.70/Resource/CMap',
++                  '/usr/share/ghostscript/8.71/Resource/CMap',
                    '%(REPORTLAB_DIR)s/fonts/CMap',       #special
                    '%(REPORTLAB_DIR)s/../fonts/CMap',    #special
                    '%(REPORTLAB_DIR)s/../../fonts/CMap', #special
diff --git a/sources b/sources
index dbe5ec3..8ca38ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-057b846bd3b7b2c3498bf14f6a523632  ReportLab_2_3.tar.gz
+cdf8b87a6cf1501de1b0a8d341a217d3  reportlab-2.5.tar.gz


More information about the scm-commits mailing list