diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-07-24 11:25:02 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-07-24 11:25:02 +0200 |
| commit | 0c4b32438a57f52601dfe66d133bd263a5d304ee (patch) | |
| tree | 9389a6db04f282ab54a2cc4ca8f55124285a5fa4 /redhat/dependencies/tqca-tls | |
| parent | 700ec263535470631ef4f6fb816000500eb4227e (diff) | |
| download | tde-packaging-0c4b32438a57f52601dfe66d133bd263a5d304ee.tar.gz tde-packaging-0c4b32438a57f52601dfe66d133bd263a5d304ee.zip | |
RPM Packaging: updates for R14
Diffstat (limited to 'redhat/dependencies/tqca-tls')
| -rw-r--r-- | redhat/dependencies/tqca-tls/tqca-tls-14.0.0-visibility.patch | 64 | ||||
| -rw-r--r-- | redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec | 5 |
2 files changed, 68 insertions, 1 deletions
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0-visibility.patch b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0-visibility.patch new file mode 100644 index 000000000..095b5508c --- /dev/null +++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0-visibility.patch @@ -0,0 +1,64 @@ +diff --git a/configure b/configure +index 0ced074..7a6fcfe 100755 +--- a/configure ++++ b/configure +@@ -44,7 +44,7 @@ while [ $# -gt 0 ]; do + done + + +-echo "Configuring qca-tls ..." ++echo "Configuring tqca-tls ..." + + if [ "$QC_DEBUG" = "Y" ]; then + echo +diff --git a/qca-tls.pro b/qca-tls.pro +index c1541bf..2457746 100644 +--- a/qca-tls.pro ++++ b/qca-tls.pro +@@ -1,8 +1,8 @@ +-# qca-tls qmake profile ++# tqca-tls qmake profile + + TEMPLATE = lib + CONFIG += qt thread release plugin +-TARGET = qca-tls ++TARGET = tqca-tls + + !exists(qcaprovider.h) { + Q_PREFIX = ../../src +@@ -13,9 +13,9 @@ HEADERS += ($$Q_PREFIX)qcaprovider.h + HEADERS = qca-tls.h + SOURCES = qca-tls.cpp + +-DEFINES += QCA_PLUGIN ++DEFINES += TQCA_PLUGIN + win32:{ +- DEFINES += QCA_PLUGIN_DLL OSSL_097 ++ DEFINES += TQCA_PLUGIN_DLL OSSL_097 + INCLUDEPATH += c:\local\include + LIBS += c:\local\lib\libeay32.lib c:\local\lib\ssleay32.lib + } +diff --git a/qca-tls.qc b/qca-tls.qc +index ef0a739..91179cf 100644 +--- a/qca-tls.qc ++++ b/qca-tls.qc +@@ -1,5 +1,5 @@ + <qconf> +- <name>qca-tls</name> ++ <name>tqca-tls</name> + <profile>qca-tls.pro</profile> + <noprefix/> + <dep type='openssl'> +diff --git a/qca.h b/qca.h +index 184a4b0..ccd6d03 100644 +--- a/qca.h ++++ b/qca.h +@@ -49,7 +49,7 @@ + # endif + #endif + #ifndef TQCA_PLUGIN_EXPORT +-#define TQCA_PLUGIN_EXPORT extern "C" ++#define TQCA_PLUGIN_EXPORT extern "C" __attribute__ ((visibility ("default"))) + #endif + + class TQHostAddress; diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec index b8bbfb5c8..c6dc18eff 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec @@ -30,6 +30,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Patch1: tqca-tls-14.0.0-visibility.patch + BuildRequires: trinity-tqt3-devel >= 3.5.0 BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tqca-devel >= 1.0 @@ -52,6 +54,7 @@ contains the TLS plugin. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%patch1 -p1 -b .visibility %build @@ -77,7 +80,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" %files %defattr(0644,root,root,0755) %doc README COPYING -%{_libdir}/tqt3/plugins/crypto/libqca-tls.so +%{_libdir}/tqt3/plugins/crypto/libtqca-tls.so %changelog |