File zarafa-07-sonames.diff of Package zarafa

Overview Repositories Revisions Requests Users Attributes Meta

File zarafa-07-sonames.diff of Package zarafa

From: Jan Engelhardt <jengelh@inai.de>
Date: 2011-07-01 13:09:00 +0200

install: properly name/version all non-plugins

# This does not impact static libraries at all, but makes life easier
# for people that actually wish to use shared libraries.

libzarafaclient:

Without proper SO versioning, unique names become a necessity.

libgsoap:

We must avoid the libgsoap.so* name, or otherwise both the (original)
libgsoap package and the zarafa package would have a "Provides:
libgsoap.so*", and in turn, package managers could select the zarafa
package for installation when the normal one was required.

Index: zarafa-7.1.5/ECtools/zarafa-archiver/Makefile.am
===================================================================
--- zarafa-7.1.8.orig/ECtools/zarafa-archiver/Makefile.am
+++ zarafa-7.1.8/ECtools/zarafa-archiver/Makefile.am
@@ -15,6 +15,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS)
 
 
 
+libarchiver_la_LDFLAGS = -release ${PACKAGE_VERSION}
 libarchiver_la_LIBADD = ${top_builddir}/mapi4linux/src/libmapi.la \
 	${top_builddir}/common/libcommon_mapi.la \
 	${top_builddir}/common/libcommon_util.la
@@ -52,6 +53,7 @@ libarchiver_core_la_SOURCES = \
 	ArchiveControlImpl.cpp ArchiveControlImpl.h \
 	ECDatabase.h ECDatabase.cpp
 
+libarchiver_core_la_LDFLAGS = -release ${PACKAGE_VERSION}
 
 
 zarafa_archiver_LDADD = ${top_builddir}/mapi4linux/src/libmapi.la \
Index: zarafa-7.1.5/common/Makefile.am
===================================================================
--- zarafa-7.1.8.orig/common/Makefile.am	2014-02-02 20:18:16.464672318 +0100
+++ zarafa-7.1.8/common/Makefile.am	2014-02-02 22:43:54.171072587 +0100
@@ -34,7 +34,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS)
 	-I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/common \
 	-I${top_srcdir}/libfreebusy $(MYSQL_INCLUDES)
 
-libcommon_mapi_la_LDFLAGS = ${AM_LDFLAGS} -static
+libcommon_mapi_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
 libcommon_mapi_la_SOURCES = CommonUtil.cpp  \
 			rtfutil.cpp					    \
 			codepage.cpp					\
@@ -59,7 +59,7 @@ libcommon_mapi_la_SOURCES = CommonUtil.c
 			MAPIErrors.cpp
 libcommon_mapi_la_LIBADD = -lpthread ${ICU_LIBS}
 
-libcommon_util_la_LDFLAGS = ${AM_LDFLAGS} -static
+libcommon_util_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
 libcommon_util_la_SOURCES = platform.cpp			\
 			platform.linux.cpp						\
 			md5.cpp									\
@@ -98,14 +98,14 @@ if HAVE_ICU
 libcommon_util_la_LIBADD += ${ICU_LIBS}
 endif
 
-libcommon_ssl_la_LDFLAGS = ${AM_LDFLAGS} -static
+libcommon_ssl_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
 libcommon_ssl_la_SOURCES = 							\
 			SSLUtil.cpp								\
 			ECChannelClient.cpp						\
 			ECChannel.cpp
 libcommon_ssl_la_LIBADD = -lpthread ${SSL_LIBS}
 
-libcommon_service_la_LDFLAGS = ${AM_LDFLAGS} -static
+libcommon_service_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
 libcommon_service_la_SOURCES = ECDatabaseMySQL.cpp
 libcommon_service_la_LIBADD = ${MYSQL_LIBS}
 
Index: zarafa-7.1.5/common/zarafa.pc.in
===================================================================
--- zarafa-7.1.5.orig/common/zarafa.pc.in
+++ zarafa-7.1.5/common/zarafa.pc.in
@@ -7,5 +7,5 @@ Name: zarafa
 Description: Zarafa custom development
 Version: @ZARAFA_VERSION@
 Requires:
-Libs: -L${libdir} -lmapi @PROG_LIBS@
+Libs: -L${libdir} -lmapi-@PACKAGE_VERSION@ @PROG_LIBS@
 Cflags: -I${includedir}/mapi4linux/ -I${includedir}/zarafa/ -DUNICODE
Index: zarafa-7.1.5/libfreebusy/Makefile.am
===================================================================
--- zarafa-7.1.5.orig/libfreebusy/Makefile.am
+++ zarafa-7.1.5/libfreebusy/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS)
 
 libfreebusy_la_includedir = $(includedir)/libfreebusy
 
-libfreebusy_la_LDFLAGS = ${AM_LDFLAGS} -static
+libfreebusy_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
 
 libfreebusy_la_include_HEADERS = ECEnumFBBlock.h ECFBBlockList.h		\
 	ECFreeBusyData.h ECFreeBusySupport.h ECFreeBusyUpdate.h freebusy.h	\
Index: zarafa-7.1.5/mapi4linux/src/Makefile.am
===================================================================
--- zarafa-7.1.5.orig/mapi4linux/src/Makefile.am
+++ zarafa-7.1.5/mapi4linux/src/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS)
 	-DMAPICONFIGDIR=\"${MAPICONFIGDIR}\" \
 	-I$(top_srcdir)/mapi4linux/include -I$(top_srcdir)/provider/common -I${top_srcdir}/common -I${top_srcdir}/libfreebusy
 
-libmapi_la_LDFLAGS = ${AM_LDFLAGS} $(BOOST_FILESYSTEM_LDFLAGS)
+libmapi_la_LDFLAGS = ${AM_LDFLAGS} $(BOOST_FILESYSTEM_LDFLAGS) -release ${PACKAGE_VERSION}
 
 libmapi_la_LIBADD = \
 			${top_builddir}/common/libcommon_mapi.la \
Index: zarafa-7.1.5/provider/common/Makefile.am
===================================================================
--- zarafa-7.1.5.orig/provider/common/Makefile.am
+++ zarafa-7.1.5/provider/common/Makefile.am
@@ -5,6 +5,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS)
 	-I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/include \
 	-I${top_builddir}/provider/soap -I${top_srcdir}/provider/soap -I${top_srcdir}/common
 
+libzarafacommon_la_LDFLAGS = -release ${PACKAGE_VERSION}
 libzarafacommon_la_SOURCES = SOAPUtils.cpp SOAPUtils.h \
 	SOAPAlloc.h \
 	SOAPHelpers.cpp SOAPHelpers.h \
Index: zarafa-7.1.5/provider/libserver/Makefile.am
===================================================================
--- zarafa-7.1.5.orig/provider/libserver/Makefile.am
+++ zarafa-7.1.5/provider/libserver/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS)
 	-I${top_srcdir}/common -DPKGLIBDIR='"${pkglibdir}"' \
 	$(MYSQL_INCLUDES) $(GSOAP_CFLAGS) $(SSL_CFLAGS) $(SSL_HAS_EVP_PKEY_CMP) $(KRB5_CFLAGS)
 
+libserver_la_LDFLAGS = -release ${PACKAGE_VERSION}
 libserver_la_SOURCES = \
 	ZarafaCmd.cpp \
 	ECABObjectTable.cpp ECABObjectTable.h \
Index: zarafa-7.1.5/provider/soap/Makefile.am
===================================================================
--- zarafa-7.1.8.orig/provider/soap/Makefile.am
+++ zarafa-7.1.8/provider/soap/Makefile.am
@@ -6,11 +6,14 @@ AM_CPPFLAGS = ${ZCPPFLAGS}
 # disable warnings since code is mostly generated
 libgsoap_la_CPPFLAGS = ${AM_CPPFLAGS} $(GSOAP_CFLAGS) $(GSOAP_DEBUGFLAGS) -DWITH_SOAPDEFS_H -I${top_srcdir}/common -w
 libgsoap_la_SOURCES = stdsoap2.cpp stdsoap2.h soapdefs.h
+libgsoap_la_LDFLAGS = -release zarafa-${PACKAGE_VERSION}
 
 libsoapserver_la_CPPFLAGS = ${AM_CPPFLAGS} $(DEBUGFLAGS) $(GSOAP_CFLAGS) -I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/include
 libsoapclient_la_CPPFLAGS = ${AM_CPPFLAGS} $(DEBUGFLAGS) $(GSOAP_CFLAGS) -I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/include
 nodist_libsoapserver_la_SOURCES = soapC.cpp soapServer.cpp
 nodist_libsoapclient_la_SOURCES = soapC.cpp soapClient.cpp
+libsoapserver_la_LDFLAGS = -release ${PACKAGE_VERSION}
+libsoapclient_la_LDFLAGS = -release ${PACKAGE_VERSION}
 
 SOAPHEADER = ${top_srcdir}/provider/include/ZarafaProto.h
 SOAP_INC = ${top_srcdir}/provider/include/
Index: zarafa-7.1.5/zarafa-libsync/Makefile.am
===================================================================
--- zarafa-7.1.5.orig/zarafa-libsync/Makefile.am
+++ zarafa-7.1.5/zarafa-libsync/Makefile.am
@@ -11,6 +11,8 @@ libzarafasync_la_LIBADD = \
 
 libzarafasync_la_includedir = $(includedir)/libzarafasync
 
+libzarafasync_la_LDFLAGS = -release ${PACKAGE_VERSION}
+
 libzarafasync_la_include_HEADERS = ECLibSync.h ECSync.h ECSyncLog.h	\
 	ECSyncUtil.h ECSyncContext.h ECOfflineABImporter.h ECSyncSettings.h ECResyncSet.h

Places

File zarafa-07-sonames.diff of Package zarafa

Places