From 12bee2a0828e2b6ec90e0641b7993c511b7e4c97 Mon Sep 17 00:00:00 2001
From: Robert Spanton <rspanton@zepler.net>
Date: Thu, 18 Jun 2009 19:48:01 +0100
Subject: [PATCH] Use the chipmunk shared library from the chipmunk package.

---
 pymunk/libload.py |   33 ++-------------------------------
 1 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/pymunk/libload.py b/pymunk/libload.py
index e63c157..659525a 100644
--- pymunk/libload.py
+++ pymunk/libload.py
@@ -4,37 +4,8 @@ import sys, imp, os
 import ctypes
  
 def load_library(libname, print_path=True):
-    # lib gets loaded from:
-    # pymunk/libchipmunk.so, libchipmunk.dylib or chipmunk.dll
-     
-    s = platform.system()
-    arch, _ = platform.architecture()
- 
-    path = os.path.dirname(os.path.abspath(__file__))
-    
-    try:
-        if hasattr(sys, "frozen") or \
-            hasattr(sys, "importers") or \
-            hasattr(imp, "is_frozen") and imp.is_forzen("__main__"):
-            if 'site-packages.zip' in __file__:
-                path = os.path.join(os.path.dirname(os.getcwd()), 'Frameworks')
-            else:
-                path = os.path.dirname(os.path.abspath(sys.executable))
-    except:
-        pass
-    
-    if s == 'Linux':
-        libfn = "lib%s.so" % libname
-
-    elif s == 'Windows' or s == 'Microsoft':
-        libfn = "%s.dll" % libname
-
-    elif s == 'Darwin':
-        libfn = "lib%s.dylib" % libname
-        
-    libfn = os.path.join(path, libfn)
+    # Library is always in this location on Fedora
+    libfn = "/usr/lib/libchipmunk.so"
     
-    if print_path:
-        print ("Loading chipmunk for %s (%s) [%s]" % (s, arch, libfn))
     lib = ctypes.cdll.LoadLibrary(libfn)
     return lib
-- 
1.6.2.2

--- setup.py.orig	2009-11-05 02:54:18.000000000 +0000
+++ setup.py	2009-11-05 02:54:10.000000000 +0000
@@ -73,12 +73,6 @@
     , description='A wrapper for the 2d physics library Chipmunk'
     , long_description=long_description
     , packages=['pymunk'] #find_packages(exclude=['*.tests']),
-    , package_data = {'pymunk': ['chipmunk.dll'
-                                , 'libchipmunk.so'
-                                , 'libchipmunk.dylib']}
-    , eager_resources = [os.path.join('pymunk','chipmunk.dll')
-                            , os.path.join('pymunk','libchipmunk.so')
-                            , os.path.join('pymunk','libchipmunk.dylib')]
     #, platforms=['win32']
     , license='MIT License'
     , classifiers=classifiers
--- pymunk.egg-info/SOURCES.txt~	2009-11-05 02:58:38.000000000 +0000
+++ pymunk.egg-info/SOURCES.txt	2009-11-05 02:58:29.000000000 +0000
@@ -62,8 +62,6 @@
 examples/pymunx_demo8_gravityfun.py
 pymunk/__init__.py
 pymunk/_chipmunk.py
-pymunk/chipmunk.dll
-pymunk/libchipmunk.so
 pymunk/libload.py
 pymunk/util.py
 pymunk/vec2d.py