rpms/pysvn/F-9 pysvn-1.5.3-remove-rpath.patch, NONE, 1.1 pysvn-1.6.1-drop-version.patch, NONE, 1.1

[Caitlyn O'Hanna]

Author: ravenoak

Update of /cvs/extras/rpms/pysvn/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1428

Added Files:
	pysvn-1.5.3-remove-rpath.patch pysvn-1.6.1-drop-version.patch 
Log Message:
Forgot the patches...


pysvn-1.5.3-remove-rpath.patch:

--- NEW FILE pysvn-1.5.3-remove-rpath.patch ---
--- Source/setup.py.orig	2008-09-24 15:02:33.000000000 -0700
+++ Source/setup.py	2008-09-24 15:03:47.000000000 -0700
@@ -336,7 +336,7 @@
 PYCXX=%(pycxx_dir)s
 PYCXXSRC=%(pycxx_src_dir)s
 LDSHARED=g++ -shared %(debug_cflags)s
-LDLIBS=-L%(svn_lib_dir)s -Wl,--rpath -Wl,%(svn_lib_dir)s \
+LDLIBS=-L%(svn_lib_dir)s \
 -lsvn_client-1 \
 -lsvn_diff-1 \
 -lsvn_repos-1 \

pysvn-1.6.1-drop-version.patch:

--- NEW FILE pysvn-1.6.1-drop-version.patch ---
--- Source/setup.py.orig	2008-10-01 16:34:29.000000000 -0700
+++ Source/setup.py	2008-10-01 16:33:38.000000000 -0700
@@ -167,14 +167,18 @@
         # name of the module including the python version to help
         # ensure that only a matching _pysvn.so for the version of
         # python is imported
-        py_cflags_list.append( '-Dinit_pysvn=init_pysvn_%d_%d' % sys.version_info[:2] )
-        py_cflags_list.append( '-Dinit_pysvn_d=init_pysvn_%d_%d_d' % sys.version_info[:2] )
+        
+        # Packager edit: We don't need this in Fedora, only one system python installed
+        #py_cflags_list.append( '-Dinit_pysvn=init_pysvn_%d_%d' % sys.version_info[:2] )
+        #py_cflags_list.append( '-Dinit_pysvn_d=init_pysvn_%d_%d_d' % sys.version_info[:2] )
 
         module_type = '.so'
         if sys.platform == 'cygwin':
             module_type = '.dll'
         template_values = {
-            'pysvn_module_name': '_pysvn_%d_%d%s' % (sys.version_info[0], sys.version_info[1], module_type),
+            'pysvn_module_name': '_pysvn%s' % (module_type),
+            # Packager edit: We don't need this in Fedora, only one system python installed
+            #'pysvn_module_name': '_pysvn_%d_%d%s' % (sys.version_info[0], sys.version_info[1], module_type),
 
             # python executable
             'python_exe':       sys.executable,
--- Source/pysvn/__init__.py.template.orig	2008-09-10 11:45:44.000000000 -0700
+++ Source/pysvn/__init__.py.template	2008-10-01 16:37:49.000000000 -0700
@@ -88,40 +88,42 @@
 SVN_DIRENT_ALL         = 0xffffffffl
 
 try:
-    maj_min = sys.version_info[:2]
-
+    # Packager edit: We don't need this in Fedora, only one system python installed
+    #maj_min = sys.version_info[:2]
+    import _pysvn
+    
 ### IMPORT BLOCK BEGIN
     #
     # use an if tree so that its easy for app makers to
     # find the import that is requires
     #
-    if maj_min == (2,3):
-        import _pysvn_2_3
-        _pysvn = _pysvn_2_3
-
-    elif maj_min == (2,4):
-        import _pysvn_2_4
-        _pysvn = _pysvn_2_4
-
-    elif maj_min == (2,5):
-        import _pysvn_2_5
-        _pysvn = _pysvn_2_5
-
-    elif maj_min == (2,6):
-        import _pysvn_2_6
-        _pysvn = _pysvn_2_6
-
-    elif maj_min == (2,7):
-        import _pysvn_2_7
-        _pysvn = _pysvn_2_7
-
-    elif maj_min == (3,0):
-        import _pysvn_3_0
-        _pysvn = _pysvn_3_0
-
-    elif maj_min == (3,1):
-        import _pysvn_3_1
-        _pysvn = _pysvn_3_1
+    #if maj_min == (2,3):
+    #    import _pysvn_2_3
+    #    _pysvn = _pysvn_2_3
+
+    #elif maj_min == (2,4):
+    #    import _pysvn_2_4
+    #    _pysvn = _pysvn_2_4
+
+    #elif maj_min == (2,5):
+    #    import _pysvn_2_5
+    #    _pysvn = _pysvn_2_5
+
+    #elif maj_min == (2,6):
+    #    import _pysvn_2_6
+    #    _pysvn = _pysvn_2_6
+
+    #elif maj_min == (2,7):
+    #    import _pysvn_2_7
+    #    _pysvn = _pysvn_2_7
+
+    #elif maj_min == (3,0):
+    #    import _pysvn_3_0
+    #    _pysvn = _pysvn_3_0
+
+    #elif maj_min == (3,1):
+    #    import _pysvn_3_1
+    #    _pysvn = _pysvn_3_1
 
     else:
         raise ImportError( 'Fix pysvn/__init__.py to support python %d.%d' % tuple(maj_min) )