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

[Michael Stahl]

 curl/ExternalPackage_curl.mk         |    6 ++----
 scp2/source/ooo/file_library_ooo.scp |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit a41deebce26dfa6b2d6d77b63bdb9d2965003678
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Oct 23 22:20:25 2013 +0200

    curl: libcurl.so.4 goes into instset, not libcurl.so!
    
    Currently we ship a libucpftp1.so with NEEDED libcurl.so.4 but that file
    is not actually in the instset, just a libcurl.so with SONAME
    libcurl.so.4.
    
    (regression in LO 4.0.0)
    
    Change-Id: I3a194c83c408587dd83ed4c690aa381664040c6f
    (cherry picked from commit 30e1d4c0a9202d5c8057efdb0bfda11f46a25251)
    Reviewed-on: https://gerrit.libreoffice.org/6411
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/curl/ExternalPackage_curl.mk b/curl/ExternalPackage_curl.mk
index 5f55260..e9cb7a1 100644
--- a/curl/ExternalPackage_curl.mk
+++ b/curl/ExternalPackage_curl.mk
@@ -24,10 +24,8 @@ $(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.
 else ifeq ($(OS),AIX)
 $(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so,lib/.libs/libcurl.so.4))
 else
-# TODO: Do we really want the unversioned library in the installation?
-# And if that's true, why do we need to deliver the versioned one at all?
-$(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0))
-$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so.4,lib/.libs/libcurl.so.4.2.0))
+$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0))
+$(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so.4,lib/.libs/libcurl.so.4.2.0))
 endif
 
 else ifeq ($(OS)$(COM),WNTGCC)
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 36ec8d4..f353d45 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -150,7 +150,7 @@ File gid_File_Lib_Curl
     #ifdef MACOSX
        Name = STRING(CONCAT2(libcurl.4,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT2(libcurl,UNXSUFFIX));
+       Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.4));
     #endif
   #else
    #ifdef _gcc3