SOURCES: python-ReportLab-setup.patch - proper patch (fixes a bug ...

[patrys]

Author: patrys                       Date: Mon Nov 19 15:43:22 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- proper patch (fixes a bug in setup.py)
- use setup.py properly instead of ripping parts of it

---- Files affected:
SOURCES:
   python-ReportLab-setup.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/python-ReportLab-setup.patch
diff -u SOURCES/python-ReportLab-setup.patch:1.1 SOURCES/python-ReportLab-setup.patch:1.2
--- SOURCES/python-ReportLab-setup.patch:1.1	Fri Nov 16 15:24:27 2007
+++ SOURCES/python-ReportLab-setup.patch	Mon Nov 19 16:43:16 2007
@@ -1,51 +1,15 @@
---- reportlab_2_1/reportlab/setup.py.orig	2007-11-16 15:12:41.267933785 +0100
-+++ reportlab_2_1/reportlab/setup.py	2007-11-16 15:13:29.260612201 +0100
-@@ -195,47 +195,9 @@
+--- reportlab_2_1/reportlab/setup.py~	2007-05-24 13:08:21.000000000 +0200
++++ reportlab_2_1/reportlab/setup.py	2007-11-19 16:25:05.594885101 +0100
+@@ -194,10 +194,11 @@
+         assert tra in _yesnoV, 'bad argument --rl_accel='+tra
          tra = tra in _yesV
  
++    DATA_FILES = {}
++    EXT_MODULES = []
      if tra:
--        RL_ACCEL = _find_rl_accel()
+         RL_ACCEL = _find_rl_accel()
          LIBS = []
-         DATA_FILES = {}
--        if not RL_ACCEL:
--            EXT_MODULES = []
--            print '***************************************************'
--            print '*No rl_accel code found, you can obtain it at     *'
--            print '*http://www.reportlab.org/downloads.html#_rl_accel*'
--            print '***************************************************'
--        else:
--            print '################################################'
--            print '#Attempting install of _rl_accel, sgmlop & pyHnj'
--            print '#extensions from',RL_ACCEL
--            print '################################################'
--            fn = pjoin(RL_ACCEL,'lib','hyphen.mashed')
--            if isfile(fn): DATA_FILES[pjoin(package_path, 'lib')] = [fn]
--            EXT_MODULES = [
--                        Extension( '_rl_accel',
--                                    [pjoin(RL_ACCEL,'_rl_accel.c')],
--                                    include_dirs=[],
--                                define_macros=[],
--                                library_dirs=[],
--                                libraries=LIBS, # libraries to link against
--                                ),
--                        Extension( 'sgmlop',
--                                [pjoin(RL_ACCEL,'sgmlop.c')],
--                                include_dirs=[],
--                                define_macros=[],
--                                library_dirs=[],
--                                libraries=LIBS, # libraries to link against
--                                ),
--                        Extension( 'pyHnj',
--                                [pjoin(RL_ACCEL,'pyHnjmodule.c'),
--                                 pjoin(RL_ACCEL,'hyphen.c'),
--                                 pjoin(RL_ACCEL,'hnjalloc.c')],
--                                include_dirs=[],
--                                define_macros=[],
--                                library_dirs=[],
--                                libraries=LIBS, # libraries to link against
--                                ),
--                        ]
-+        EXT_MODULES = []
-     for fn in _FILES:
-         fn = os.sep.join(fn.split('/'))
-         if isfile(fn):
+-        DATA_FILES = {}
+         if not RL_ACCEL:
+             EXT_MODULES = []
+             print '***************************************************'
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/python-ReportLab-setup.patch?r1=1.1&r2=1.2&f=u