Jon Ciesla 92f1da8
--- pymunk/libload.py~	2010-02-07 22:58:20.000000000 -0600
Jon Ciesla 92f1da8
+++ pymunk/libload.py	2010-07-15 09:16:27.240569523 -0500
Jon Ciesla 92f1da8
@@ -21,77 +21,7 @@
Jon Ciesla 92f1da8
     
Jon Ciesla 92f1da8
  
Jon Ciesla 92f1da8
 def load_library(libname, print_path=True):
Jon Ciesla 92f1da8
-    # lib gets loaded from
Jon Ciesla 92f1da8
-    # 32bit python: pymunk/libchipmunk.so, libchipmunk.dylib or chipmunk.dll
Jon Ciesla 92f1da8
-    # 64 bit python pymunk/libchipmunk64.so, libchipmunk.dylib or chipmunk64.dll
Jon Ciesla 92f1da8
-    
Jon Ciesla 92f1da8
-    s = platform.system()
Jon Ciesla 92f1da8
-    arch = str(ctypes.sizeof(ctypes.c_voidp) * 8)
Jon Ciesla 92f1da8
-    
Jon Ciesla 92f1da8
-    path = os.path.dirname(os.path.abspath(__file__))
Jon Ciesla 92f1da8
-    
Jon Ciesla 92f1da8
-    try:
Jon Ciesla 92f1da8
-        if hasattr(sys, "frozen") or \
Jon Ciesla 92f1da8
-            hasattr(sys, "importers") or \
Jon Ciesla 92f1da8
-            hasattr(imp, "is_frozen") and imp.is_forzen("__main__"):
Jon Ciesla 92f1da8
-            if 'site-packages.zip' in __file__:
Jon Ciesla 92f1da8
-                path = os.path.join(os.path.dirname(os.getcwd()), 'Frameworks')
Jon Ciesla 92f1da8
-            else:
Jon Ciesla 92f1da8
-                path = os.path.dirname(os.path.abspath(sys.executable))
Jon Ciesla 92f1da8
-    except:
Jon Ciesla 92f1da8
-        pass
Jon Ciesla 92f1da8
-    
Jon Ciesla 92f1da8
-    if arch == "64":
Jon Ciesla 92f1da8
-        arch_param = "64"
Jon Ciesla 92f1da8
-    else:
Jon Ciesla 92f1da8
-        arch_param = ""
Jon Ciesla 92f1da8
-    
Jon Ciesla 92f1da8
-    if s in ('Linux', 'FreeBSD'):
Jon Ciesla 92f1da8
-        libfn = "lib%s%s.so" % (libname, arch_param)
Jon Ciesla 92f1da8
-        
Jon Ciesla 92f1da8
-    elif s in ('Windows', 'Microsoft'):
Jon Ciesla 92f1da8
-        libfn = "%s%s.dll" % (libname, arch_param)
Jon Ciesla 92f1da8
-        
Jon Ciesla 92f1da8
-    elif s == 'Darwin':
Jon Ciesla 92f1da8
-        libfn = "lib%s.dylib" % libname
Jon Ciesla 92f1da8
-        
Jon Ciesla 92f1da8
-    # we use *nix library naming as default
Jon Ciesla 92f1da8
-    else: 
Jon Ciesla 92f1da8
-        libfn = "lib%s.so" % libname
Jon Ciesla 92f1da8
-        
Jon Ciesla 92f1da8
-    libfn = os.path.join(path, libfn)
Jon Ciesla 92f1da8
-    
Jon Ciesla 92f1da8
-    
Jon Ciesla 92f1da8
-    if print_path:
Jon Ciesla 92f1da8
-        print ("Loading chipmunk for %s (%sbit) [%s]" % (s, arch, libfn))
Jon Ciesla 92f1da8
-    try:
Jon Ciesla 92f1da8
-        lib = platform_specific_functions()['library_loader'].LoadLibrary(libfn)
Jon Ciesla 92f1da8
-    except OSError: 
Jon Ciesla 92f1da8
-        print ("""
Jon Ciesla 92f1da8
-Failed to load pymunk library.
Jon Ciesla 92f1da8
-
Jon Ciesla 92f1da8
-This error usually means that you don't have a compiled version of chipmunk in 
Jon Ciesla 92f1da8
-the correct spot where pymunk can find it. pymunk does not include precompiled 
Jon Ciesla 92f1da8
-chipmunk library files for all platforms. 
Jon Ciesla 92f1da8
-
Jon Ciesla 92f1da8
-The good news is that it is usually enough (at least on *nix and OS X) to 
Jon Ciesla 92f1da8
-simply run the compile command first before installing and then retry again:
Jon Ciesla 92f1da8
-
Jon Ciesla 92f1da8
-You compile chipmunk with
Jon Ciesla 92f1da8
-> python setup.py build_chipmunk
Jon Ciesla 92f1da8
-and then continue as usual with 
Jon Ciesla 92f1da8
-> python setup.py install
Jon Ciesla 92f1da8
-> cd examples
Jon Ciesla 92f1da8
-> python basic_test.py
Jon Ciesla 92f1da8
-
Jon Ciesla 92f1da8
-(for complete instructions please see the readme file)
Jon Ciesla 92f1da8
-
Jon Ciesla 92f1da8
-If it still doesnt work, please report as a bug on the issue tracker at 
Jon Ciesla 92f1da8
-http://code.google.com/p/pymunk/issues
Jon Ciesla 92f1da8
-Remember to include information about your OS, which version of python you use 
Jon Ciesla 92f1da8
-and the version of pymunk you tried to run. A description of what you did to 
Jon Ciesla 92f1da8
-trigger the error is also good. Please include the exception traceback if any 
Jon Ciesla 92f1da8
-(usually found below this message).
Jon Ciesla 92f1da8
-""")
Jon Ciesla 92f1da8
-        raise
Jon Ciesla 92f1da8
+    # Library is always in this location on Fedora
e973a25
+    libfn = "/usr/lib/libchipmunk.so.5.3.4"
Jon Ciesla 92f1da8
+    lib = platform_specific_functions()['library_loader'].LoadLibrary(libfn)
Jon Ciesla 92f1da8
     return lib
Jon Ciesla 92f1da8
--- setup.py~	2010-03-07 21:21:08.000000000 -0600
Jon Ciesla 92f1da8
+++ setup.py	2010-07-15 08:59:15.231318426 -0500
Jon Ciesla 92f1da8
@@ -99,11 +99,6 @@
Jon Ciesla 92f1da8
     , description='A python wrapper for the 2d physics library Chipmunk'
Jon Ciesla 92f1da8
     , long_description=long_description
Jon Ciesla 92f1da8
     , packages=['pymunk'] #find_packages(exclude=['*.tests']),
Jon Ciesla 92f1da8
-    , package_data = {'pymunk': ['chipmunk.dll'
Jon Ciesla 92f1da8
-                                , 'chipmunk64.dll'
Jon Ciesla 92f1da8
-                                , 'libchipmunk.so'
Jon Ciesla 92f1da8
-                                , 'libchipmunk64.so'
Jon Ciesla 92f1da8
-                                , 'libchipmunk.dylib']}
Jon Ciesla 92f1da8
     , eager_resources = [os.path.join('pymunk','chipmunk.dll')
Jon Ciesla 92f1da8
                             , os.path.join('pymunk','chipmunk64.dll')
Jon Ciesla 92f1da8
                             , os.path.join('pymunk','libchipmunk.so')
Jon Ciesla 92f1da8
--- pymunk.egg-info/SOURCES.txt~	2010-03-07 22:20:40.000000000 -0600
Jon Ciesla 92f1da8
+++ pymunk.egg-info/SOURCES.txt	2010-07-15 09:00:45.069319331 -0500
Jon Ciesla 92f1da8
@@ -121,10 +121,7 @@
Jon Ciesla 92f1da8
 examples/slide_and_pinjoint.py
Jon Ciesla 92f1da8
 pymunk/__init__.py
Jon Ciesla 92f1da8
 pymunk/_chipmunk.py
Jon Ciesla 92f1da8
-pymunk/chipmunk.dll
Jon Ciesla 92f1da8
 pymunk/constraint.py
Jon Ciesla 92f1da8
-pymunk/libchipmunk.so
Jon Ciesla 92f1da8
-pymunk/libchipmunk64.so
Jon Ciesla 92f1da8
 pymunk/libload.py
Jon Ciesla 92f1da8
 pymunk/util.py
Jon Ciesla 92f1da8
 pymunk/vec2d.py