[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - scp2/source

[Stephan Bergmann]

 scp2/source/ooo/ure.scp |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit dc5faf7021001777a7127cb88b0d7f32434bf868
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jul 9 15:39:56 2013 +0200

    fdo#66703: Missing libjava_uno.jnilib symlink
    
    Regression introduced with c9c963d3e6991d0dd73a95fc9734e38683d5be9c "autoinstall
    ure private libraries."
    
    Change-Id: I8ea597e8d5108e925e982d7b37fa9e1d3af8d1aa
    (cherry picked from commit e83ce4d1495db41cb68142da771c10e61cda0fd9)
    Reviewed-on: https://gerrit.libreoffice.org/4787
    Reviewed-by: Petr Mladek <pmladek at suse.cz>
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index d127ab6..6c775b9 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -294,11 +294,12 @@ End
 #endif
 
 #if defined SOLAR_JAVA && defined MACOSX
-Shortcut gid_Shortcut_Dl_JavaUno
-    FileID = gid_File_Dl_JavaUno;
+Unixlink gid_Unixlink_Dl_JavaUno
+    BIN_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = "libjava_uno.jnilib";
-    Styles = (RELATIVE);
+    Target = "libjava_uno.dylib";
+    Styles = ();
 End
 #endif
 
@@ -706,6 +707,7 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Misc_ServicesRdb,
             gid_File_Misc_JavavendorsXml);
     Unixlinks = (gid_Unixlink_Ure_Bin_Urelibs,
+                 gid_Unixlink_Dl_JavaUno,
                  gid_Unixlink_File_Dl_Sal,
                  gid_Unixlink_File_Dl_Salhelper,
                  gid_Unixlink_File_Dl_Cppu,