rpms/openchange/devel libmapi-0.8.2-libmapi-conflict.patch, NONE, 1.1 openchange.spec, 1.7, 1.8

Matthew Barnes mbarnes at fedoraproject.org
Mon Jun 29 18:12:36 UTC 2009 

Author: mbarnes

Update of /cvs/pkgs/rpms/openchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29629

Modified Files:
	openchange.spec 
Added Files:
	libmapi-0.8.2-libmapi-conflict.patch 
Log Message:

* Mon Jun 29 2009 Matthew Barnes <mbarnes at redhat.com> - 0.8.2-3
- Rename libmapi so as not to conflict with Zarafa (RH bug #505783).


libmapi-0.8.2-libmapi-conflict.patch:

--- NEW FILE libmapi-0.8.2-libmapi-conflict.patch ---
diff -up libmapi-0.8.2-ROMULUS/libmapi.pc.in.libmapi-conflict libmapi-0.8.2-ROMULUS/libmapi.pc.in
--- libmapi-0.8.2-ROMULUS/libmapi.pc.in.libmapi-conflict	2009-06-29 13:58:55.000000000 -0400
+++ libmapi-0.8.2-ROMULUS/libmapi.pc.in	2009-06-29 13:58:32.000000000 -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 ldb
diff -up libmapi-0.8.2-ROMULUS/Makefile.libmapi-conflict libmapi-0.8.2-ROMULUS/Makefile
--- libmapi-0.8.2-ROMULUS/Makefile.libmapi-conflict	2009-06-29 13:49:38.000000000 -0400
+++ libmapi-0.8.2-ROMULUS/Makefile	2009-06-29 13:58:09.000000000 -0400
@@ -142,7 +142,7 @@ LIBMAPI_SO_VERSION = 0
 libmapi:	idl					\
 		libmapi/version.h			\
 		libmapi/proto.h				\
-		libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)	
+		libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
 
 libmapi-install:	libmapi			\
 			libmapi-installpc	\
@@ -179,8 +179,9 @@ endif
 	rm -f *~
 	rm -f */*~
 	rm -f */*/*~
-	rm -f libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION) \
-		  libmapi.$(SHLIBEXT)
+	rm -f libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) \
+		  libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION) \
+		  libmapi-openchange.$(SHLIBEXT)
 
 clean:: libmapi-clean
 
@@ -197,8 +198,8 @@ libmapi-installpc:
 libmapi-installlib:
 	@echo "[*] install: libmapi library"
 	$(INSTALL) -d $(DESTDIR)$(libdir)
-	$(INSTALL) -m 0755 libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)
-	ln -sf libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapi.$(SHLIBEXT)
+	$(INSTALL) -m 0755 libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)
+	ln -sf libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapi-openchange.$(SHLIBEXT)
 
 libmapi-installheader:
 	@echo "[*] install: libmapi headers"
@@ -232,7 +233,7 @@ libmapi-uninstallpc:
 	rm -f $(DESTDIR)$(libdir)/pkgconfig/libmapi.pc
 
 libmapi-uninstalllib:
-	rm -f $(DESTDIR)$(libdir)/libmapi.*
+	rm -f $(DESTDIR)$(libdir)/libmapi-openchange.*
 
 libmapi-uninstallheader:
 	rm -rf $(DESTDIR)$(includedir)/libmapi
@@ -243,7 +244,7 @@ libmapi-uninstallscript:
 	rm -f $(DESTDIR)$(datadir)/setup/profiles/oc_profiles*
 	rm -rf $(DESTDIR)$(datadir)/setup/profiles
 
-libmapi.$(SHLIBEXT).$(PACKAGE_VERSION): 		\
+libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION): 		\
 	libmapi/IABContainer.po				\
 	libmapi/IProfAdmin.po				\
 	libmapi/IMAPIContainer.po			\
@@ -285,10 +286,10 @@ libmapi.$(SHLIBEXT).$(PACKAGE_VERSION): 
 	libmapi/socket/netif.po				\
 	libmapi/utf8_convert.yy.po
 	@echo "Linking $@"
-	@$(CC) $(DSOOPT) -Wl,-soname,libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION) -o $@ $^ $(LIBS)
+	@$(CC) $(DSOOPT) -Wl,-soname,libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION) -o $@ $^ $(LIBS)
 
 
-libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION): libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION): libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
 	ln -fs $< $@
 
 libmapi/version.h: VERSION
@@ -399,7 +400,7 @@ libmapixx-test-clean:
 clean:: libmapixx-tests-clean
 
 bin/libmapixx-test:	libmapi++/tests/test.cpp	\
-		libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+		libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
 	@echo "Linking sample application $@"
 	@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
 
@@ -412,7 +413,7 @@ libmapixx-attach-clean:
 	rm -f libmapi++/tests/*.o
 
 bin/libmapixx-attach: libmapi++/tests/attach_test.cpp	\
-		  libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+		  libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
 	@echo "Linking sample application $@"
 	@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
 
@@ -431,14 +432,14 @@ libmapixx-messages-clean:
 	rm -f libmapi++/examples/*.o
 
 libmapi++/examples/foldertree: libmapi++/examples/foldertree.cpp	\
-		  libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+		  libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
 	@echo "Linking foldertree example application $@"
 	@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
 
 clean:: libmapixx-foldertree-clean
 
 libmapi++/examples/messages: libmapi++/examples/messages.cpp	\
-		  libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+		  libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
 	@echo "Linking messages example application $@"
 	@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
 
@@ -506,7 +507,7 @@ libmapiadmin-uninstallheader:
 libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSION):	\
 	libmapiadmin/mapiadmin_user.po		\
 	libmapiadmin/mapiadmin.po 		\
-	libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+	libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
 	@echo "Linking $@"
 	@$(CC) $(DSOOPT) -Wl,-soname,libmapiadmin.$(SHLIBEXT).$(LIBMAPIADMIN_SO_VERSION) -o $@ $^ $(LIBS) $(LIBMAPIADMIN_LIBS) 
 
@@ -586,7 +587,7 @@ libocpf.$(SHLIBEXT).$(PACKAGE_VERSION):	
 	libocpf/ocpf_dump.po			\
 	libocpf/ocpf_api.po			\
 	libocpf/ocpf_write.po			\
-	libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+	libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
 	@echo "Linking $@"
 	@$(CC) $(DSOOPT) -Wl,-soname,libocpf.$(SHLIBEXT).$(LIBOCPF_SO_VERSION) -o $@ $^ $(LIBS)
 
@@ -667,7 +668,7 @@ torture/openchange.$(SHLIBEXT):			\
 	torture/mapi_namedprops.po		\
 	torture/mapi_recipient.po		\
 	torture/openchange.po			\
-	libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+	libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
 	@echo "Linking $@"
 	@$(CC) -o $@ $(DSOOPT) $^ -L. $(LIBS)
 
@@ -800,7 +801,7 @@ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PAC
 							mapiproxy/libmapiproxy/openchangedb_property.po		\
 							mapiproxy/libmapiproxy/mapi_handles.po			\
 							mapiproxy/libmapiproxy/entryid.po			\
-							libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+							libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
 	@$(CC) -o $@ $(DSOOPT) -Wl,-soname,libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ -L. $(LIBS)
 
 mapiproxy/libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION): libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
@@ -1072,7 +1073,7 @@ clean:: openchangeclient-clean
 
 bin/openchangeclient: 	utils/openchangeclient.o			\
 			utils/openchange-tools.o			\
-			libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)		\
+			libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) \
 			libocpf.$(SHLIBEXT).$(PACKAGE_VERSION)
 	@echo "Linking $@"
 	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
@@ -1099,7 +1100,7 @@ clean:: mapiprofile-clean
 
 bin/mapiprofile: 	utils/mapiprofile.o 			\
 			utils/openchange-tools.o 		\
-			libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+			libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
 	@echo "Linking $@"
 	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
 
@@ -1125,7 +1126,7 @@ clean:: openchangepfadmin-clean
 
 bin/openchangepfadmin:	utils/openchangepfadmin.o			\
 			utils/openchange-tools.o			\
-			libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) 		\
+			libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) \
 			libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSION)
 	@echo "Linking $@"
 	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBMAPIADMIN_LIBS) -lpopt			
@@ -1153,7 +1154,7 @@ clean:: exchange2mbox-clean
 
 bin/exchange2mbox:	utils/exchange2mbox.o				\
 			utils/openchange-tools.o			\
-			libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+			libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
 	@echo "Linking $@"
 	@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt  $(MAGIC_LIBS)
 
@@ -1186,7 +1187,7 @@ bin/exchange2ical:	utils/exchange2ical/e
 			utils/exchange2ical/exchange2ical_property.o	\
 			utils/exchange2ical/exchange2ical_utils.o	\
 			utils/openchange-tools.o			\
-			libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+			libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
 	@echo "Linking $@"
 	@$(CC) -o $@ $^ $(LIBS) $(ICAL_LIBS) -lpopt
 
@@ -1236,7 +1237,7 @@ bin/mapitest:	utils/mapitest/mapitest.o	
 		utils/mapitest/modules/module_noserver.o	\
 		utils/mapitest/modules/module_errorchecks.o	\
 		utils/mapitest/modules/module_lcid.o		\
-		libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)		
+		libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
 	@echo "Linking $@"
 	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
 
@@ -1285,7 +1286,7 @@ clean:: openchangemapidump-clean
 bin/openchangemapidump:	utils/backup/openchangemapidump.o		\
 			utils/backup/openchangebackup.o			\
 			utils/openchange-tools.o			\
-			libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+			libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
 	@echo "Linking $@"
 	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
 
@@ -1332,7 +1333,7 @@ locale_codepage-clean::
 
 clean:: locale_codepage-clean
 
-bin/locale_codepage: libmapi/tests/locale_codepage.o libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+bin/locale_codepage: libmapi/tests/locale_codepage.o libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
 	@echo "Linking $@"
 	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
 
@@ -1346,7 +1347,7 @@ pymapi: $(pythonscriptdir)/mapi.$(SHLIBE
 
 pymapi/%: CFLAGS+=`$(PYTHON_CONFIG) --cflags` -fPIC
 
-$(pythonscriptdir)/mapi.$(SHLIBEXT): $(patsubst %.c,%.o,$(wildcard pymapi/*.c)) libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+$(pythonscriptdir)/mapi.$(SHLIBEXT): $(patsubst %.c,%.o,$(wildcard pymapi/*.c)) libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
 	$(CC) -o $@ $^ `$(PYTHON_CONFIG) --libs` $(DSOOPT)
 
 pymapi-install::
@@ -1472,7 +1473,7 @@ clean::
 
 test:: check
 
-check:: torture/openchange.$(SHLIBEXT) libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
+check:: torture/openchange.$(SHLIBEXT) libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
 	# FIXME: Set up server
 	LD_LIBRARY_PATH=`pwd` $(SMBTORTURE) --load-module torture/openchange.$(SHLIBEXT) ncalrpc: OPENCHANGE
 	./bin/mapitest --mapi-calls 


Index: openchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openchange/devel/openchange.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- openchange.spec	7 May 2009 17:01:04 -0000	1.7
+++ openchange.spec	29 Jun 2009 18:12:06 -0000	1.8
@@ -10,7 +10,7 @@
 
 Name: openchange
 Version: 0.8.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/System
 Summary: Provides access to Microsoft Exchange servers using native protocols
 License: GPLv3+ and Public Domain
@@ -35,6 +35,12 @@ BuildRequires: samba4-pidl >= %{samba4_v
 BuildRequires: sqlite-devel
 BuildRequires: zlib-devel
 
+### Patches ###
+
+# OpenChange's libmapi conflicts with Zarafa's libmapi.
+# Zarafa is older than OpenChange, so it wins.
+Patch1: libmapi-0.8.2-libmapi-conflict.patch
+
 %description
 OpenChange provides libraries to access Microsoft Exchange servers
 using native protocols.
@@ -77,6 +83,7 @@ This package provides the server element
 
 %prep
 %setup -q -n libmapi-%{version}-%{nickname}
+%patch1 -p1 -b .libmapi-conflict
 
 %build
 %configure
@@ -115,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING IDL_LICENSE.txt VERSION
-%{_libdir}/libmapi.so.*
+%{_libdir}/libmapi-openchange.so.*
 %{_libdir}/libmapiadmin.so.*
 %{_libdir}/libocpf.so.*
 
@@ -146,6 +153,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mapistore_backends/mapistore_sqlite3.so
 
 %changelog
+* Mon Jun 29 2009 Matthew Barnes <mbarnes at redhat.com> - 0.8.2-3
+- Rename libmapi so as not to conflict with Zarafa (RH bug #505783).
+
 * Thu May 07 2009 Matthew Barnes <mbarnes at redhat.com> - 0.8.2-2
 - Do not own the pkgconfig directory (RH bug #499655).

More information about the fedora-extras-commits mailing list