Update to release 3.1.1 (rhbz#1206371)
- Remove upstreamed patches - Correct python package names - Use license macro
This commit is contained in:
parent
7eb9fde79b
commit
8b2f97fcf1
11 changed files with 1021 additions and 1697 deletions
|
|
@ -1,38 +0,0 @@
|
|||
diff -up ./port/PyAssimp/pyassimp/helper.py.pythonpath ./port/PyAssimp/pyassimp/helper.py
|
||||
--- ./port/PyAssimp/pyassimp/helper.py.pythonpath 2012-10-24 22:04:36.698871141 -0400
|
||||
+++ ./port/PyAssimp/pyassimp/helper.py 2012-10-24 22:05:44.265445828 -0400
|
||||
@@ -17,11 +17,12 @@ additional_dirs, ext_whitelist = [],[]
|
||||
# populate search directories and lists of allowed file extensions
|
||||
# depending on the platform we're running on.
|
||||
if os.name=='posix':
|
||||
- additional_dirs.append('/usr/local/lib/')
|
||||
-
|
||||
+ additional_dirs.append('/usr/lib64/')
|
||||
+ additional_dirs.append('/usr/lib/')
|
||||
# note - this won't catch libassimp.so.N.n, but
|
||||
# currently there's always a symlink called
|
||||
# libassimp.so in /usr/local/lib.
|
||||
+ ext_whitelist.append('.0')
|
||||
ext_whitelist.append('.so')
|
||||
|
||||
elif os.name=='nt':
|
||||
diff -up ./port/PyAssimp3/pyassimp/helper.py.pythonpath ./port/PyAssimp3/pyassimp/helper.py
|
||||
--- ./port/PyAssimp3/pyassimp/helper.py.pythonpath 2012-07-11 06:53:04.000000000 -0600
|
||||
+++ ./port/PyAssimp3/pyassimp/helper.py 2014-03-02 02:50:14.253038683 -0700
|
||||
# populate search directories and lists of allowed file extensions
|
||||
# depending on the platform we're running on.
|
||||
if os.name=='posix':
|
||||
- additional_dirs.append('/usr/local/lib/')
|
||||
+ additional_dirs.append('/usr/lib/')
|
||||
+ additional_dirs.append('/usr/lib64/')
|
||||
|
||||
if sys.platform.lower() == 'darwin':
|
||||
ext_whitelist.append('.dylib')
|
||||
@@ -25,6 +26,7 @@
|
||||
# note - this won't catch libassimp.so.N.n, but
|
||||
# currently there's always a symlink called
|
||||
# libassimp.so in /usr/local/lib.
|
||||
+ ext_whitelist.append('.0')
|
||||
ext_whitelist.append('.so')
|
||||
|
||||
elif os.name=='nt':
|
||||
Loading…
Add table
Add a link
Reference in a new issue