diff options
| author | Petr Mladek <pmladek@suse.cz> | 2010-11-23 15:48:13 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2010-11-23 15:48:13 +0100 |
| commit | a434bc4266e148ff25b52df173da22efd27b186a (patch) | |
| tree | 9e9e7d64d391df00123a54bd50588b7ac0d908b9 | |
| parent | 4a24b4e8a27057717b02249a433510dfd9918d4d (diff) | |
find the internal libpython (fdo#31764)
libpython2.6.so symlink was not created, so pyuno was not able to find the
internal libpython2.6.so.1.0
| -rw-r--r-- | scp2/source/python/file_python.scp | 8 | ||||
| -rw-r--r-- | scp2/source/python/module_python.scp | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index e58687658..84e234e43 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -142,6 +142,14 @@ File gid_File_Lib_Python_So Name = STRING(PY_FULL_DLL_NAME); Styles = (PACKED); End +#ifdef UNX +Shortcut gid_Shortcut_Lib_Python_So + FileID = gid_File_Lib_Python_So; + Dir = gid_Dir_Program; + Name = STRING(CONCAT3(libpython,PYMAJMIN,UNXSUFFIX)); + Styles = (NETWORK,RELATIVE); +End +#endif //UNX #else //MACOSX //directory entries solely to be able to create the symlinks Directory gid_Dir_PythonFramework diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index 3abeec2e3..30dab8578 100644 --- a/scp2/source/python/module_python.scp +++ b/scp2/source/python/module_python.scp @@ -32,7 +32,7 @@ Module gid_Module_Optional_Pyuno MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON ); ParentID = gid_Module_Optional; Sortkey = "750"; - Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So, gid_File_Lib_Python_So_Brand, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd); + Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Lib_Python_So_Brand, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd); Minimal = NO; Default = YES; Styles = ( ); |