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