rpms/pyglet/devel pyglet-lib-loading-order.patch, 1.1, 1.2 pyglet.spec, 1.1, 1.2

Author: oget Update of /cvs/free/rpms/pyglet/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv5346 Modified Files: pyglet-lib-loading-order.patch pyglet.spec Log Message: * Tue Feb 03 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.1.2-6 - Fix lib-loading-order patch pyglet-lib-loading-order.patch: Index: pyglet-lib-loading-order.patch =================================================================== RCS file: /cvs/free/rpms/pyglet/devel/pyglet-lib-loading-order.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pyglet-lib-loading-order.patch 16 Jan 2009 18:49:26 -0000 1.1 +++ pyglet-lib-loading-order.patch 3 Feb 2009 17:08:41 -0000 1.2 @@ -1,44 +1,14 @@ diff -rupN old/pyglet-1.1.2/pyglet/lib.py new/pyglet-1.1.2/pyglet/lib.py --- old/pyglet-1.1.2/pyglet/lib.py 2008-08-26 06:44:55.000000000 -0400 -+++ new/pyglet-1.1.2/pyglet/lib.py 2009-01-15 22:27:59.000000000 -0500 -@@ -101,24 +101,24 @@ class LibraryLoader(object): ++++ new/pyglet-1.1.2/pyglet/lib.py 2009-02-03 12:04:12.000000000 -0500 +@@ -95,8 +95,8 @@ class LibraryLoader(object): + elif type(platform_names) is tuple: + platform_names = list(platform_names) + +- if self.platform == 'linux2': +- platform_names.extend(['lib%s.so' % n for n in names]) ++ #if self.platform == 'linux2': ++ # platform_names.extend(['lib%s.so' % n for n in names]) + platform_names.extend(names) for name in platform_names: - try: -- lib = ctypes.cdll.LoadLibrary(name) -- if _debug_lib: -- print name -- if _debug_trace: -- lib = _TraceLibrary(lib) -- return lib -- except OSError: - path = self.find_library(name) - if path: -- try: -- lib = ctypes.cdll.LoadLibrary(path) -- if _debug_lib: -- print path -- if _debug_trace: -- lib = _TraceLibrary(lib) -- return lib -- except OSError: -- pass -+ lib = ctypes.cdll.LoadLibrary(path) -+ if _debug_lib: -+ print path -+ if _debug_trace: -+ lib = _TraceLibrary(lib) -+ return lib -+ except OSError: -+ try: -+ lib = ctypes.cdll.LoadLibrary(name) -+ if _debug_lib: -+ print name -+ if _debug_trace: -+ lib = _TraceLibrary(lib) -+ return lib -+ except OSError: -+ pass - raise ImportError('Library "%s" not found.' % names[0]) - - find_library = lambda self, name: ctypes.util.find_library(name) Index: pyglet.spec =================================================================== RCS file: /cvs/free/rpms/pyglet/devel/pyglet.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pyglet.spec 16 Jan 2009 18:49:26 -0000 1.1 +++ pyglet.spec 3 Feb 2009 17:08:41 -0000 1.2 @@ -2,7 +2,7 @@ Name: pyglet Version: 1.1.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A cross-platform windowing and multimedia library for Python Group: Development/Libraries License: BSD @@ -115,6 +115,9 @@ %{_datadir}/%{name} %changelog +* Tue Feb 03 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.1.2-6 +- Fix lib-loading-order patch + * Fri Jan 16 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.1.2-5 - Add Requires: avbin libGL libGLU