[openchange] Update libmapi-0.8.2-libmapi-conflict.patch

Matthew Barnes mbarnes at fedoraproject.org
Thu Aug 21 10:29:27 UTC 2014 

commit 551f362381ad91fc0417faea5000de259ae3cc2a
Author: Matthew Barnes <mbarnes at redhat.com>
Date:   Thu Aug 21 06:29:15 2014 -0400

    Update libmapi-0.8.2-libmapi-conflict.patch

 libmapi-0.8.2-libmapi-conflict.patch |  136 +++++++++++++++++-----------------
 1 files changed, 68 insertions(+), 68 deletions(-)
---
diff --git a/libmapi-0.8.2-libmapi-conflict.patch b/libmapi-0.8.2-libmapi-conflict.patch
index 8713427..511474f 100644
--- a/libmapi-0.8.2-libmapi-conflict.patch
+++ b/libmapi-0.8.2-libmapi-conflict.patch
@@ -1,7 +1,19 @@
-diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRANT/Makefile
---- openchange-2.1-QUADRANT/Makefile.libmapi-conflict	2014-04-23 21:43:06.000000000 +0200
-+++ openchange-2.1-QUADRANT/Makefile	2014-04-28 11:32:25.889997620 +0200
-@@ -162,7 +162,7 @@ LIBMAPI_SO_VERSION = 0
+diff -up openchange-2.2-NANOPROBE/libmapi.pc.in.libmapi-conflict openchange-2.2-NANOPROBE/libmapi.pc.in
+--- openchange-2.2-NANOPROBE/libmapi.pc.in.libmapi-conflict	2014-08-11 11:51:05.000000000 -0400
++++ openchange-2.2-NANOPROBE/libmapi.pc.in	2014-08-21 06:24:07.870168897 -0400
+@@ -8,7 +8,7 @@ datadir=@datadir@
+ Name: MAPI
+ Description: MAPI Protocol Implementation
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lmapi
++Libs: -L${libdir} -lmapi-openchange
+ Libs.private: @LIBS@
+ Cflags: -I${includedir}
+ Requires: talloc dcerpc ndr tevent
+diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOPROBE/Makefile
+--- openchange-2.2-NANOPROBE/Makefile.libmapi-conflict	2014-08-11 11:51:05.000000000 -0400
++++ openchange-2.2-NANOPROBE/Makefile	2014-08-21 06:28:00.875407210 -0400
+@@ -166,7 +166,7 @@ LIBMAPI_SO_VERSION = 0
  
  libmapi:	idl					\
  		libmapi/version.h			\
@@ -10,7 +22,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  
  libmapi-install:	libmapi			\
  			libmapi-installpc	\
-@@ -195,8 +195,8 @@ endif
+@@ -199,8 +199,8 @@ endif
  	rm -f *~
  	rm -f */*~
  	rm -f */*/*~
@@ -21,7 +33,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  
  clean:: libmapi-clean
  
-@@ -213,10 +213,10 @@ libmapi-installpc:
+@@ -217,10 +217,10 @@ libmapi-installpc:
  libmapi-installlib:
  	@echo "[*] install: libmapi library"
  	$(INSTALL) -d $(DESTDIR)$(libdir)
@@ -35,7 +47,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  endif
  
  libmapi-installheader:
-@@ -258,7 +258,7 @@ libmapi-uninstallpc:
+@@ -262,7 +262,7 @@ libmapi-uninstallpc:
  	rm -f $(DESTDIR)$(libdir)/pkgconfig/libmapi.pc
  
  libmapi-uninstalllib:
@@ -44,7 +56,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  
  libmapi-uninstallheader:
  	rm -rf $(DESTDIR)$(includedir)/libmapi
-@@ -269,7 +269,7 @@ libmapi-uninstallscript:
+@@ -273,7 +273,7 @@ libmapi-uninstallscript:
  	rm -f $(DESTDIR)$(datadir)/setup/profiles/oc_profiles*
  	rm -rf $(DESTDIR)$(datadir)/setup/profiles
  
@@ -53,7 +65,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  	libmapi/emsmdb.po				\
  	libmapi/async_emsmdb.po				\
  	libmapi/IABContainer.po				\
-@@ -313,10 +313,10 @@ libmapi.$(SHLIBEXT).$(PACKAGE_VERSION):
+@@ -317,10 +317,10 @@ libmapi.$(SHLIBEXT).$(PACKAGE_VERSION):
  	libmapi/socket/interface.po			\
  	libmapi/socket/netif.po				
  	@echo "Linking $@"
@@ -66,7 +78,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  	ln -fs $< $@
  
  libmapi/version.h: VERSION
-@@ -351,7 +351,7 @@ libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION)
+@@ -355,7 +355,7 @@ libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION)
  	libmapi++/src/object.po			\
  	libmapi++/src/profile.po		\
  	libmapi++/src/session.po \
@@ -75,7 +87,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  	@echo "Linking $@"
  	@$(CXX) $(DSOOPT) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,-soname,libmapipp.$(SHLIBEXT).$(LIBMAPIPP_SO_VERSION) -o $@ $^ $(LIBS) 
  
-@@ -432,7 +432,7 @@ clean:: libmapixx-tests-clean
+@@ -436,7 +436,7 @@ clean:: libmapixx-tests-clean
  
  bin/libmapixx-test:	libmapi++/tests/test.cpp	\
  		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -84,7 +96,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  	@echo "Linking sample application $@"
  	@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) 
  
-@@ -447,7 +447,7 @@ libmapixx-attach-clean:
+@@ -451,7 +451,7 @@ libmapixx-attach-clean:
  
  bin/libmapixx-attach: libmapi++/tests/attach_test.po	\
  		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -93,7 +105,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  	@echo "Linking sample application $@"
  	@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
  
-@@ -457,7 +457,7 @@ libmapixx-exception: bin/libmapixx-excep
+@@ -461,7 +461,7 @@ libmapixx-exception: bin/libmapixx-excep
   
  bin/libmapixx-exception: libmapi++/tests/exception_test.cpp \
  		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -102,7 +114,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  	@echo "Linking exception test application $@"
  	@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
  
-@@ -477,7 +477,7 @@ libmapixx-profiletest-clean:
+@@ -481,7 +481,7 @@ libmapixx-profiletest-clean:
  
  bin/libmapixx-profiletest: libmapi++/tests/profile_test.po	\
  		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -111,7 +123,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  	@echo "Linking profile test application $@"
  	@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
  
-@@ -498,7 +498,7 @@ libmapixx-messages-clean:
+@@ -502,7 +502,7 @@ libmapixx-messages-clean:
  
  libmapi++/examples/foldertree: libmapi++/examples/foldertree.cpp	\
  		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -120,7 +132,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  	@echo "Linking foldertree example application $@"
  	@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
  
-@@ -506,7 +506,7 @@ clean:: libmapixx-foldertree-clean
+@@ -510,7 +510,7 @@ clean:: libmapixx-foldertree-clean
  
  libmapi++/examples/messages: libmapi++/examples/messages.cpp	\
  		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -129,7 +141,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  	@echo "Linking messages example application $@"
  	@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
  
-@@ -573,7 +573,7 @@ libmapiadmin-uninstallheader:
+@@ -577,7 +577,7 @@ libmapiadmin-uninstallheader:
  libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSION):	\
  	libmapiadmin/mapiadmin_user.po		\
  	libmapiadmin/mapiadmin.po 		\
@@ -138,7 +150,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  	@echo "Linking $@"
  	@$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiadmin.$(SHLIBEXT).$(LIBMAPIADMIN_SO_VERSION) -o $@ $^ $(LIBS) $(LIBMAPIADMIN_LIBS) 
  
-@@ -650,7 +650,7 @@ libocpf.$(SHLIBEXT).$(PACKAGE_VERSION):
+@@ -654,7 +654,7 @@ libocpf.$(SHLIBEXT).$(PACKAGE_VERSION):
  	libocpf/ocpf_dump.po			\
  	libocpf/ocpf_api.po			\
  	libocpf/ocpf_write.po			\
@@ -147,7 +159,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  	@echo "Linking $@"
  	@$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libocpf.$(SHLIBEXT).$(LIBOCPF_SO_VERSION) -o $@ $^ $(LIBS)
  
-@@ -724,7 +724,7 @@ mapiproxy/dcesrv_mapiproxy.$(SHLIBEXT):
+@@ -728,7 +728,7 @@ mapiproxy/dcesrv_mapiproxy.$(SHLIBEXT):
  						gen_ndr/ndr_exchange.po				
  
  	@echo "Linking $@"
@@ -156,34 +168,34 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  
  mapiproxy/dcesrv_mapiproxy.c: gen_ndr/ndr_exchange_s.c gen_ndr/ndr_exchange.c
  
-@@ -772,7 +772,7 @@ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PAC
- 							mapiproxy/libmapiproxy/entryid.po			\
+@@ -781,7 +781,7 @@ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PAC
  							mapiproxy/libmapiproxy/modules.po			\
- 							mapiproxy/libmapiproxy/fault_util.po	\
+ 							mapiproxy/libmapiproxy/fault_util.po			\
+ 							mapiproxy/util/mysql.po					\
 -							libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
 +							libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
- 	@$(CC) -o $@ $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ -L. $(LIBS) $(TDB_LIBS) $(DL_LIBS)
+ 	@$(CC) -o $@ $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ -L. $(LIBS) $(TDB_LIBS) $(DL_LIBS) $(MYSQL_LIBS)
  
-@@ -918,7 +918,7 @@ mapiproxy/libmapistore.$(SHLIBEXT).$(PAC
- 							mapiproxy/libmapistore/mapistore_replica_mapping.po		\
- 							mapiproxy/libmapistore/mapistore_namedprops.po			\
- 							mapiproxy/libmapistore/mapistore_notification.po 		\
+@@ -937,7 +937,7 @@ mapiproxy/libmapistore.$(SHLIBEXT).$(PAC
+ 							mapiproxy/libmapistore/backends/indexing_mysql.po		\
+ 							mapiproxy/util/mysql.po						\
+ 							mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)		\
 -							libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
 +							libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
- 	@$(CC) -o $@ $(DSOOPT) $^ -L. $(LDFLAGS) $(LIBS) $(TDB_LIBS) $(DL_LIBS) -Wl,-soname,libmapistore.$(SHLIBEXT).$(LIBMAPISTORE_SO_VERSION)
+ 	@$(CC) $(DSOOPT) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libmapistore.$(SHLIBEXT).$(LIBMAPISTORE_SO_VERSION) -o $@ $^ $(LIBS) $(TDB_LIBS) $(DL_LIBS) $(MYSQL_LIBS)
  
-@@ -940,7 +940,7 @@ mapistore_test: bin/mapistore_test
- bin/mapistore_test: 	mapiproxy/libmapistore/tests/mapistore_test.o		\
- 			mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION)
+@@ -960,7 +960,7 @@ bin/mapistore_test: 	mapiproxy/libmapist
+ 			mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION)	\
+ 			mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
 -	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt -L. libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
 +	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt -L. libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
  
  mapistore_clean:
  	rm -f mapiproxy/libmapistore/tests/*.o
-@@ -1109,7 +1109,7 @@ clean:: openchangeclient-clean
+@@ -1135,7 +1135,7 @@ clean:: openchangeclient-clean
  
  bin/openchangeclient: 	utils/openchangeclient.o			\
  			utils/openchange-tools.o			\
@@ -192,7 +204,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  			libocpf.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
  	@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
-@@ -1138,7 +1138,7 @@ clean:: mapiprofile-clean
+@@ -1164,7 +1164,7 @@ clean:: mapiprofile-clean
  
  bin/mapiprofile: 	utils/mapiprofile.o 			\
  			utils/openchange-tools.o 		\
@@ -201,7 +213,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  	@echo "Linking $@"
  	@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
  
-@@ -1166,7 +1166,7 @@ clean:: openchangepfadmin-clean
+@@ -1192,7 +1192,7 @@ clean:: openchangepfadmin-clean
  
  bin/openchangepfadmin:	utils/openchangepfadmin.o			\
  			utils/openchange-tools.o			\
@@ -210,7 +222,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  			libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBMAPIADMIN_LIBS) -lpopt			
-@@ -1198,7 +1198,7 @@ clean:: exchange2mbox-clean
+@@ -1224,7 +1224,7 @@ clean:: exchange2mbox-clean
  
  bin/exchange2mbox:	utils/exchange2mbox.o				\
  			utils/openchange-tools.o			\
@@ -219,7 +231,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt  $(MAGIC_LIBS)
  
-@@ -1262,7 +1262,7 @@ bin/exchange2ical:	utils/exchange2ical_t
+@@ -1288,7 +1288,7 @@ bin/exchange2ical:	utils/exchange2ical_t
  			libexchange2ical/ical2exchange.o	\
  			libexchange2ical/ical2exchange_property.o	\
  			utils/openchange-tools.o			\
@@ -228,7 +240,16 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  	@echo "Linking $@"
  	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(ICAL_LIBS) -lpopt
  
-@@ -1326,7 +1326,7 @@ bin/mapitest:	utils/mapitest/mapitest.o
+@@ -1321,7 +1321,7 @@ bin/openchange-testsuite: 	testsuite/tes
+ 				mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION)	\
+ 				mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking $@"
+-	@$(CC) $(CFLAGS) $(CHECK_CFLAGS) $(TDB_CFLAGS) -I. -Itestsuite/ -Imapiproxy -o $@ $^ $(LDFLAGS) $(LIBS) $(TDB_LIBS) $(CHECK_LIBS) $(MYSQL_LIBS) libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
++	@$(CC) $(CFLAGS) $(CHECK_CFLAGS) $(TDB_CFLAGS) -I. -Itestsuite/ -Imapiproxy -o $@ $^ $(LDFLAGS) $(LIBS) $(TDB_LIBS) $(CHECK_LIBS) $(MYSQL_LIBS) libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 
+ testsuite-check:	testsuite
+ 	@LD_LIBRARY_PATH=. CK_XML_LOG_FILE_NAME=test_results.xml ./bin/openchange-testsuite
+@@ -1388,7 +1388,7 @@ bin/mapitest:	utils/mapitest/mapitest.o
  		utils/mapitest/modules/module_lcid.o		\
  		utils/mapitest/modules/module_mapidump.o	\
  		utils/mapitest/modules/module_lzxpress.o	\
@@ -237,7 +258,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SUBUNIT_LIBS)
  
-@@ -1384,7 +1384,7 @@ clean:: openchangemapidump-clean
+@@ -1448,7 +1448,7 @@ clean:: openchangemapidump-clean
  bin/openchangemapidump:	utils/backup/openchangemapidump.o		\
  			utils/backup/openchangebackup.o			\
  			utils/openchange-tools.o			\
@@ -246,16 +267,16 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
  
-@@ -1435,7 +1435,7 @@ check_fasttransfer-clean::
+@@ -1499,7 +1499,7 @@ check_fasttransfer-clean::
  clean:: check_fasttransfer-clean
  
- bin/check_fasttransfer:	testprogs/check_fasttransfer.o			\
--			libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)		\
-+			libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)		\
- 			mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION)
+ bin/check_fasttransfer:	testprogs/check_fasttransfer.o				\
+-			libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)			\
++			libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)			\
+ 			mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION)	\
+ 			mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
- 	@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt
-@@ -1462,7 +1462,7 @@ test_asyncnotif-clean::
+@@ -1527,7 +1527,7 @@ test_asyncnotif-clean::
  clean:: test_asyncnotif-clean
  
  bin/test_asyncnotif:	testprogs/test_asyncnotif.o			\
@@ -264,7 +285,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt
  
-@@ -1507,13 +1507,13 @@ pyopenchange: 	$(pythonscriptdir)/opench
+@@ -1572,13 +1572,13 @@ pyopenchange: 	$(pythonscriptdir)/opench
  
  $(pythonscriptdir)/openchange/mapi.$(SHLIBEXT):	pyopenchange/pymapi.c				\
  						pyopenchange/pymapi_properties.c		\
@@ -280,16 +301,7 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  # 	@echo "Linking $@"
  # 	@$(CC) $(CFLAGS) $(DSOOPT) $(LDFLAGS) -o $@ $^ $(PYTHON_CFLAGS) $(PYTHON_LIBS) $(LIBS) 
  
-@@ -1630,7 +1630,7 @@ ctags:
- 
- test:: check
- 
--check:: libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
-+check:: libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
- 	# FIXME: Set up server
- 	./bin/mapitest --mapi-calls 
- 
-@@ -1703,7 +1703,7 @@ libqtmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+@@ -1766,7 +1766,7 @@ libqtmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
  
  qt/demo/demoapp: qt/demo/demoapp.o 				\
  	qt/demo/main.o 					\
@@ -298,15 +310,3 @@ diff -up openchange-2.1-QUADRANT/Makefile.libmapi-conflict openchange-2.1-QUADRA
  	libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION)	\
  	libqtmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
-diff -up openchange-2.1-QUADRANT/libmapi.pc.in.libmapi-conflict openchange-2.1-QUADRANT/libmapi.pc.in
---- openchange-2.1-QUADRANT/libmapi.pc.in.libmapi-conflict	2014-04-23 21:43:06.000000000 +0200
-+++ openchange-2.1-QUADRANT/libmapi.pc.in	2014-04-28 11:31:09.018000824 +0200
-@@ -8,7 +8,7 @@ datadir=@datadir@
- Name: MAPI
- Description: MAPI Protocol Implementation
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lmapi
-+Libs: -L${libdir} -lmapi-openchange
- Libs.private: @LIBS@
- Cflags: -I${includedir}
- Requires: talloc dcerpc ndr tevent

More information about the scm-commits mailing list