[gsoap] Move openssl libraries to Libs.private in pkg-config files

Mattias Ellert ellert at fedoraproject.org
Tue Nov 1 15:40:55 UTC 2011 

commit 2f38905a5203035e47b002f2c81fc64898b0a2dd
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Tue Nov 1 16:39:49 2011 +0100

    Move openssl libraries to Libs.private in pkg-config files

 gsoap-libtool.patch |   39 +++++++++++++++++++++++++++++++--------
 gsoap.spec          |    5 ++++-
 2 files changed, 35 insertions(+), 9 deletions(-)
---
diff --git a/gsoap-libtool.patch b/gsoap-libtool.patch
index c240568..3ad765e 100644
--- a/gsoap-libtool.patch
+++ b/gsoap-libtool.patch
@@ -1,6 +1,6 @@
 diff -ur gsoap-2.8.orig/configure.in gsoap-2.8/configure.in
 --- gsoap-2.8.orig/configure.in	2011-10-22 23:12:11.000000000 +0200
-+++ gsoap-2.8/configure.in	2011-10-31 18:28:15.407071755 +0100
++++ gsoap-2.8/configure.in	2011-11-01 06:25:39.071999543 +0100
 @@ -16,8 +16,7 @@
  AM_PROG_LEX
  AC_PROG_YACC
@@ -20,7 +20,8 @@ diff -ur gsoap-2.8.orig/configure.in gsoap-2.8/configure.in
    else
      AC_MSG_RESULT(no)
      WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
-     WSDL2H_EXTRA_LIBS="-lssl -lcrypto -lz"
+-    WSDL2H_EXTRA_LIBS="-lssl -lcrypto -lz"
++    WSDL2H_EXTRA_LIBS=
      SAMPLE_SSL_LIBS="-lssl -lcrypto -lz"
 -    WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
 +    WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la"
@@ -38,7 +39,7 @@ diff -ur gsoap-2.8.orig/configure.in gsoap-2.8/configure.in
  AC_SUBST(WSDL2H_EXTRA_LIBS)
 diff -ur gsoap-2.8.orig/gsoap/Makefile.am gsoap-2.8/gsoap/Makefile.am
 --- gsoap-2.8.orig/gsoap/Makefile.am	2011-10-22 23:12:12.000000000 +0200
-+++ gsoap-2.8/gsoap/Makefile.am	2011-10-31 18:50:50.430109556 +0100
++++ gsoap-2.8/gsoap/Makefile.am	2011-11-01 06:25:39.071999543 +0100
 @@ -34,20 +34,22 @@
  dom_cpp.cpp: dom.cpp
  	$(LN_S) -f $(srcdir)/dom.cpp dom_cpp.cpp
@@ -68,16 +69,16 @@ diff -ur gsoap-2.8.orig/gsoap/Makefile.am gsoap-2.8/gsoap/Makefile.am
 +libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
 +libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c
 +libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM
-+libgsoapssl_la_LIBADD = -lssl -lcrypto
++libgsoapssl_la_LIBADD = -lssl -lcrypto -lz
 +libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
 +libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM
-+libgsoapssl___la_LIBADD = -lssl -lcrypto
++libgsoapssl___la_LIBADD = -lssl -lcrypto -lz
  
  BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES)
  
 diff -ur gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am gsoap-2.8/gsoap/samples/autotest/Makefile.am
 --- gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am	2011-10-22 23:12:14.000000000 +0200
-+++ gsoap-2.8/gsoap/samples/autotest/Makefile.am	2011-10-31 18:28:15.464071762 +0100
++++ gsoap-2.8/gsoap/samples/autotest/Makefile.am	2011-11-01 06:25:39.071999543 +0100
 @@ -14,7 +14,7 @@
  WSDLINPUT=$(srcdir)/examples.wsdl
  SOAPHEADER=$(srcdir)/examples.h
@@ -89,7 +90,7 @@ diff -ur gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am gsoap-2.8/gsoap/sampl
  	$(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
 diff -ur gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am gsoap-2.8/gsoap/samples/databinding/Makefile.am
 --- gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am	2011-10-22 23:12:15.000000000 +0200
-+++ gsoap-2.8/gsoap/samples/databinding/Makefile.am	2011-10-31 18:28:15.465071761 +0100
++++ gsoap-2.8/gsoap/samples/databinding/Makefile.am	2011-11-01 06:25:39.071999543 +0100
 @@ -14,7 +14,7 @@
  WSDLINPUT=$(srcdir)/address.xsd
  SOAPHEADER=$(srcdir)/address.h
@@ -101,7 +102,7 @@ diff -ur gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am gsoap-2.8/gsoap/sa
  	$(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
 diff -ur gsoap-2.8.orig/gsoap/samples/Makefile.defines gsoap-2.8/gsoap/samples/Makefile.defines
 --- gsoap-2.8.orig/gsoap/samples/Makefile.defines	2011-10-22 23:12:15.000000000 +0200
-+++ gsoap-2.8/gsoap/samples/Makefile.defines	2011-10-31 18:28:15.466071760 +0100
++++ gsoap-2.8/gsoap/samples/Makefile.defines	2011-11-01 06:25:39.071999543 +0100
 @@ -15,13 +15,13 @@
  SOAP_C_CORE=soapC.c
  SOAP_C_CLIENT=soapClient.c $(SOAP_C_CORE)
@@ -122,3 +123,25 @@ diff -ur gsoap-2.8.orig/gsoap/samples/Makefile.defines gsoap-2.8/gsoap/samples/M
 +SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la
 +SOAP_CPP_LIB_CK=$(top_builddir)/gsoap/libgsoapck++.la
 +SOAP_CPP_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl++.la
+diff -ur gsoap-2.8.orig/gsoapssl.pc.in gsoap-2.8/gsoapssl.pc.in
+--- gsoap-2.8.orig/gsoapssl.pc.in	2011-10-22 23:12:15.000000000 +0200
++++ gsoap-2.8/gsoapssl.pc.in	2011-11-01 06:28:07.452002816 +0100
+@@ -7,5 +7,6 @@
+ Description: SOAP C Web Services with SSL and ZLIB
+ Version: @VERSION@
+ Requires:
+-Libs: -L${libdir} -lgsoapssl @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@
++Libs: -L${libdir} -lgsoapssl
++Libs.private: @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@
+ Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir}
+diff -ur gsoap-2.8.orig/gsoapssl++.pc.in gsoap-2.8/gsoapssl++.pc.in
+--- gsoap-2.8.orig/gsoapssl++.pc.in	2011-10-22 23:12:15.000000000 +0200
++++ gsoap-2.8/gsoapssl++.pc.in	2011-11-01 06:28:06.400004525 +0100
+@@ -7,5 +7,6 @@
+ Description: SOAP C++ Web Services with SSL and ZLIB
+ Version: @VERSION@
+ Requires:
+-Libs: -L${libdir} -lgsoapssl++ @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@
++Libs: -L${libdir} -lgsoapssl++
++Libs.private: @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@
+ Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir}
diff --git a/gsoap.spec b/gsoap.spec
index 46115cb..e035788 100644
--- a/gsoap.spec
+++ b/gsoap.spec
@@ -1,7 +1,7 @@
 Summary: Generator Tools for Coding SOAP/XML Web Services in C and C++
 Name: gsoap
 Version: 2.8.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 # gsoap is licensed both under the gSOAP public license and under GPL version
 # 2 or later with an OpenSSL linking exception.
 #
@@ -278,6 +278,9 @@ make check
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Nov 01 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8.4-2
+- Move openssl libraries to Libs.private in pkg-config files
+
 * Mon Oct 31 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8.4-1
 - Update to gsoap 2.8.4
 - Drop gsoap-ipv6.patch implemented upstream

More information about the scm-commits mailing list