[openchange] Update to 1.0

Milan Crha mcrha at fedoraproject.org
Mon Mar 19 10:40:07 UTC 2012 

commit 9e9faacfccf905199e2bf53ed9b2cfd7c8db9073
Author: Milan Crha <mcrha at redhat.com>
Date:   Mon Mar 19 11:39:52 2012 +0100

    Update to 1.0

 .gitignore                              |    1 +
 libmapi-0.8.2-libmapi-conflict.patch    |  112 ++++++------
 openchange-0.11-pt-mv-unicode.patch     |  324 -------------------------------
 openchange-0.11-session-as-memctx.patch |   24 ---
 openchange.spec                         |   21 +--
 sources                                 |    2 +-
 6 files changed, 66 insertions(+), 418 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ec5c906..69c0f9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ openchange-0.9-COCHRANE.tar.gz
 /openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1.tar.gz
 /openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT2.tar.gz
 /openchange-0.11-TRANSPORTER.tar.gz
+/openchange-1.0-BORG.tar.gz
diff --git a/libmapi-0.8.2-libmapi-conflict.patch b/libmapi-0.8.2-libmapi-conflict.patch
index 599befd..9678676 100644
--- a/libmapi-0.8.2-libmapi-conflict.patch
+++ b/libmapi-0.8.2-libmapi-conflict.patch
@@ -1,6 +1,6 @@
-diff -up openchange-0.11-TRANSPORTER/libmapi.pc.in.libmapi-conflict openchange-0.11-TRANSPORTER/libmapi.pc.in
---- openchange-0.11-TRANSPORTER/libmapi.pc.in.libmapi-conflict	2009-08-05 21:20:11.000000000 +0200
-+++ openchange-0.11-TRANSPORTER/libmapi.pc.in	2011-08-05 07:01:18.932122274 +0200
+diff -up openchange-1.0-BORG/libmapi.pc.in.libmapi-conflict openchange-1.0-BORG/libmapi.pc.in
+--- openchange-1.0-BORG/libmapi.pc.in.libmapi-conflict	2009-08-05 21:20:11.000000000 +0200
++++ openchange-1.0-BORG/libmapi.pc.in	2012-03-19 11:31:57.845339070 +0100
 @@ -8,7 +8,7 @@ datadir=@datadir@
  Name: MAPI
  Description: MAPI Protocol Implementation
@@ -10,10 +10,10 @@ diff -up openchange-0.11-TRANSPORTER/libmapi.pc.in.libmapi-conflict openchange-0
  Libs.private: @LIBS@
  Cflags: -I${includedir}
  Requires: talloc dcerpc ndr tevent
-diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-TRANSPORTER/Makefile
---- openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict	2011-05-19 06:52:46.000000000 +0200
-+++ openchange-0.11-TRANSPORTER/Makefile	2011-08-05 07:04:08.371001021 +0200
-@@ -158,7 +158,7 @@ LIBMAPI_SO_VERSION = 0
+diff -up openchange-1.0-BORG/Makefile.libmapi-conflict openchange-1.0-BORG/Makefile
+--- openchange-1.0-BORG/Makefile.libmapi-conflict	2012-03-15 14:50:43.000000000 +0100
++++ openchange-1.0-BORG/Makefile	2012-03-19 11:34:46.894424573 +0100
+@@ -159,7 +159,7 @@ LIBMAPI_SO_VERSION = 0
  
  libmapi:	idl					\
  		libmapi/version.h			\
@@ -22,7 +22,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  
  libmapi-install:	libmapi			\
  			libmapi-installpc	\
-@@ -191,8 +191,8 @@ endif
+@@ -192,8 +192,8 @@ endif
  	rm -f *~
  	rm -f */*~
  	rm -f */*/*~
@@ -33,7 +33,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  
  clean:: libmapi-clean
  
-@@ -209,10 +209,10 @@ libmapi-installpc:
+@@ -210,10 +210,10 @@ libmapi-installpc:
  libmapi-installlib:
  	@echo "[*] install: libmapi library"
  	$(INSTALL) -d $(DESTDIR)$(libdir)
@@ -47,7 +47,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  endif
  
  libmapi-installheader:
-@@ -250,7 +250,7 @@ libmapi-uninstallpc:
+@@ -254,7 +254,7 @@ libmapi-uninstallpc:
  	rm -f $(DESTDIR)$(libdir)/pkgconfig/libmapi.pc
  
  libmapi-uninstalllib:
@@ -56,7 +56,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  
  libmapi-uninstallheader:
  	rm -rf $(DESTDIR)$(includedir)/libmapi
-@@ -261,7 +261,7 @@ libmapi-uninstallscript:
+@@ -265,7 +265,7 @@ libmapi-uninstallscript:
  	rm -f $(DESTDIR)$(datadir)/setup/profiles/oc_profiles*
  	rm -rf $(DESTDIR)$(datadir)/setup/profiles
  
@@ -65,7 +65,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  	libmapi/emsmdb.po				\
  	libmapi/async_emsmdb.po				\
  	libmapi/IABContainer.po				\
-@@ -304,10 +304,10 @@ libmapi.$(SHLIBEXT).$(PACKAGE_VERSION): 
+@@ -309,10 +309,10 @@ libmapi.$(SHLIBEXT).$(PACKAGE_VERSION):
  	libmapi/socket/interface.po			\
  	libmapi/socket/netif.po				
  	@echo "Linking $@"
@@ -78,7 +78,16 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  	ln -fs $< $@
  
  libmapi/version.h: VERSION
-@@ -424,7 +424,7 @@ clean:: libmapixx-tests-clean
+@@ -349,7 +349,7 @@ libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	libmapi++/src/object.po			\
+ 	libmapi++/src/profile.po		\
+ 	libmapi++/src/session.po \
+-	libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
++	libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
+ 	@echo "Linking $@"
+ 	@$(CXX) $(DSOOPT) $(CXXFLAGS) $(LDFLAGS) -Wl,-soname,libmapipp.$(SHLIBEXT).$(LIBMAPIPP_SO_VERSION) -o $@ $^ $(LIBS) 
+ 
+@@ -430,7 +430,7 @@ clean:: libmapixx-tests-clean
  
  bin/libmapixx-test:	libmapi++/tests/test.cpp	\
  		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -87,7 +96,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  	@echo "Linking sample application $@"
  	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) 
  
-@@ -439,7 +439,7 @@ libmapixx-attach-clean:
+@@ -445,7 +445,7 @@ libmapixx-attach-clean:
  
  bin/libmapixx-attach: libmapi++/tests/attach_test.po	\
  		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -96,7 +105,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  	@echo "Linking sample application $@"
  	@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
  
-@@ -449,7 +449,7 @@ libmapixx-exception: bin/libmapixx-excep
+@@ -455,7 +455,7 @@ libmapixx-exception: bin/libmapixx-excep
   
  bin/libmapixx-exception: libmapi++/tests/exception_test.cpp \
  		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -105,7 +114,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  	@echo "Linking exception test application $@"
  	@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
  
-@@ -469,7 +469,7 @@ libmapixx-profiletest-clean:
+@@ -475,7 +475,7 @@ libmapixx-profiletest-clean:
  
  bin/libmapixx-profiletest: libmapi++/tests/profile_test.po	\
  		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -114,7 +123,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  	@echo "Linking profile test application $@"
  	@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
  
-@@ -490,7 +490,7 @@ libmapixx-messages-clean:
+@@ -496,7 +496,7 @@ libmapixx-messages-clean:
  
  libmapi++/examples/foldertree: libmapi++/examples/foldertree.cpp	\
  		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -123,7 +132,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  	@echo "Linking foldertree example application $@"
  	@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
  
-@@ -498,7 +498,7 @@ clean:: libmapixx-foldertree-clean
+@@ -504,7 +504,7 @@ clean:: libmapixx-foldertree-clean
  
  libmapi++/examples/messages: libmapi++/examples/messages.cpp	\
  		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -132,7 +141,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  	@echo "Linking messages example application $@"
  	@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
  
-@@ -565,7 +565,7 @@ libmapiadmin-uninstallheader:
+@@ -571,7 +571,7 @@ libmapiadmin-uninstallheader:
  libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSION):	\
  	libmapiadmin/mapiadmin_user.po		\
  	libmapiadmin/mapiadmin.po 		\
@@ -141,7 +150,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  	@echo "Linking $@"
  	@$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiadmin.$(SHLIBEXT).$(LIBMAPIADMIN_SO_VERSION) -o $@ $^ $(LIBS) $(LIBMAPIADMIN_LIBS) 
  
-@@ -642,7 +642,7 @@ libocpf.$(SHLIBEXT).$(PACKAGE_VERSION):	
+@@ -648,7 +648,7 @@ libocpf.$(SHLIBEXT).$(PACKAGE_VERSION):
  	libocpf/ocpf_dump.po			\
  	libocpf/ocpf_api.po			\
  	libocpf/ocpf_write.po			\
@@ -150,7 +159,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  	@echo "Linking $@"
  	@$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libocpf.$(SHLIBEXT).$(LIBOCPF_SO_VERSION) -o $@ $^ $(LIBS)
  
-@@ -716,7 +716,7 @@ mapiproxy/dcesrv_mapiproxy.$(SHLIBEXT): 
+@@ -722,7 +722,7 @@ mapiproxy/dcesrv_mapiproxy.$(SHLIBEXT):
  						gen_ndr/ndr_exchange.po				
  
  	@echo "Linking $@"
@@ -159,25 +168,25 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  
  mapiproxy/dcesrv_mapiproxy.c: gen_ndr/ndr_exchange_s.c gen_ndr/ndr_exchange.c
  
-@@ -755,7 +755,7 @@ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PAC
- 							mapiproxy/libmapiproxy/openchangedb_property.po		\
+@@ -766,7 +766,7 @@ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PAC
  							mapiproxy/libmapiproxy/mapi_handles.po			\
  							mapiproxy/libmapiproxy/entryid.po			\
+ 							mapiproxy/libmapiproxy/modules.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)
  
-@@ -888,7 +888,7 @@ mapiproxy/libmapistore.$(SHLIBEXT).$(PAC
- 							mapiproxy/libmapistore/database/mapistoredb.po				\
- 							mapiproxy/libmapistore/database/mapistoredb_conf.po			\
- 							mapiproxy/libmapistore/database/mapistoredb_namedprops.po		\
+@@ -898,7 +898,7 @@ mapiproxy/libmapistore.$(SHLIBEXT).$(PAC
+ 							mapiproxy/libmapistore/mapistore_replica_mapping.po		\
+ 							mapiproxy/libmapistore/mapistore_namedprops.po			\
+ 							mapiproxy/libmapistore/mapistore_notification.po 		\
 -							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)
  
-@@ -967,7 +967,7 @@ mapistore_test: bin/mapistore_test
+@@ -923,7 +923,7 @@ mapistore_test: bin/mapistore_test
  bin/mapistore_test: 	mapiproxy/libmapistore/tests/mapistore_test.o		\
  			mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
@@ -186,7 +195,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  
  mapistore_clean:
  	rm -f mapiproxy/libmapistore/tests/*.o
-@@ -1128,7 +1128,7 @@ clean:: openchangeclient-clean
+@@ -1086,7 +1086,7 @@ clean:: openchangeclient-clean
  
  bin/openchangeclient: 	utils/openchangeclient.o			\
  			utils/openchange-tools.o			\
@@ -195,7 +204,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  			libocpf.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
  	@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
-@@ -1157,7 +1157,7 @@ clean:: mapiprofile-clean
+@@ -1115,7 +1115,7 @@ clean:: mapiprofile-clean
  
  bin/mapiprofile: 	utils/mapiprofile.o 			\
  			utils/openchange-tools.o 		\
@@ -204,7 +213,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  	@echo "Linking $@"
  	@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
  
-@@ -1185,7 +1185,7 @@ clean:: openchangepfadmin-clean
+@@ -1143,7 +1143,7 @@ clean:: openchangepfadmin-clean
  
  bin/openchangepfadmin:	utils/openchangepfadmin.o			\
  			utils/openchange-tools.o			\
@@ -213,7 +222,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  			libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBMAPIADMIN_LIBS) -lpopt			
-@@ -1217,7 +1217,7 @@ clean:: exchange2mbox-clean
+@@ -1175,7 +1175,7 @@ clean:: exchange2mbox-clean
  
  bin/exchange2mbox:	utils/exchange2mbox.o				\
  			utils/openchange-tools.o			\
@@ -222,7 +231,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt  $(MAGIC_LIBS)
  
-@@ -1281,7 +1281,7 @@ bin/exchange2ical:	utils/exchange2ical_t
+@@ -1239,7 +1239,7 @@ bin/exchange2ical:	utils/exchange2ical_t
  			libexchange2ical/ical2exchange.o	\
  			libexchange2ical/ical2exchange_property.o	\
  			utils/openchange-tools.o			\
@@ -231,7 +240,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  	@echo "Linking $@"
  	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(ICAL_LIBS) -lpopt
  
-@@ -1344,7 +1344,7 @@ bin/mapitest:	utils/mapitest/mapitest.o	
+@@ -1303,7 +1303,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	\
@@ -240,7 +249,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SUBUNIT_LIBS)
  
-@@ -1401,7 +1401,7 @@ clean:: openchangemapidump-clean
+@@ -1361,7 +1361,7 @@ clean:: openchangemapidump-clean
  bin/openchangemapidump:	utils/backup/openchangemapidump.o		\
  			utils/backup/openchangebackup.o			\
  			utils/openchange-tools.o			\
@@ -249,7 +258,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
  
-@@ -1452,7 +1452,7 @@ check_fasttransfer-clean::
+@@ -1412,7 +1412,7 @@ check_fasttransfer-clean::
  clean:: check_fasttransfer-clean
  
  bin/check_fasttransfer:	testprogs/check_fasttransfer.o			\
@@ -258,7 +267,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  			mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt
-@@ -1479,7 +1479,7 @@ test_asyncnotif-clean::
+@@ -1439,7 +1439,7 @@ test_asyncnotif-clean::
  clean:: test_asyncnotif-clean
  
  bin/test_asyncnotif:	testprogs/test_asyncnotif.o			\
@@ -267,32 +276,23 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt
  
-@@ -1493,7 +1493,7 @@ pythonscriptdir = python
- 
- #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::
-@@ -1539,13 +1539,13 @@ pyopenchange: 	$(pythonscriptdir)/opench
+@@ -1484,13 +1484,13 @@ pyopenchange: 	$(pythonscriptdir)/opench
  
  $(pythonscriptdir)/openchange/mapi.$(SHLIBEXT):	pyopenchange/pymapi.c				\
  						pyopenchange/pymapi_properties.c		\
 -						libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
 +						libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
- 	@$(CC) $(CFLAGS) $(DSOOPT) $(LDFLAGS) -o $@ $^ `$(PYTHON_CONFIG) --cflags --libs` $(LIBS) 
+ 	@$(CC) $(CFLAGS) -fno-strict-aliasing $(DSOOPT) $(LDFLAGS) -o $@ $^ $(PYTHON_CFLAGS) $(PYTHON_LIBS) $(LIBS) 
  
- $(pythonscriptdir)/openchange/ocpf.$(SHLIBEXT):	pyopenchange/pyocpf.c				\
- 						libocpf.$(SHLIBEXT).$(PACKAGE_VERSION)		\
--						libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
-+						libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
- 	@echo "Linking $@"
- 	@$(CC) $(CFLAGS) $(DSOOPT) $(LDFLAGS) -o $@ $^ `$(PYTHON_CONFIG) --cflags --libs` $(LIBS) 
+ # $(pythonscriptdir)/openchange/ocpf.$(SHLIBEXT):	pyopenchange/pyocpf.c				\
+ # 						libocpf.$(SHLIBEXT).$(PACKAGE_VERSION)		\
+-# 						libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
++# 						libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ # 	@echo "Linking $@"
+ # 	@$(CC) $(CFLAGS) $(DSOOPT) $(LDFLAGS) -o $@ $^ $(PYTHON_CFLAGS) $(PYTHON_LIBS) $(LIBS) 
  
-@@ -1667,7 +1667,7 @@ ctags:
+@@ -1608,7 +1608,7 @@ ctags:
  
  test:: check
  
@@ -301,7 +301,7 @@ diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-T
  	# FIXME: Set up server
  	./bin/mapitest --mapi-calls 
  
-@@ -1740,7 +1740,7 @@ libqtmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+@@ -1681,7 +1681,7 @@ libqtmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
  
  qt/demo/demoapp: qt/demo/demoapp.o 				\
  	qt/demo/main.o 					\
diff --git a/openchange.spec b/openchange.spec
index 4ec2061..9d91ae4 100644
--- a/openchange.spec
+++ b/openchange.spec
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%global samba4_version 4.0.0-37.alpha16
+%global samba4_version 4.0.0-103.alpha18
 %global talloc_version 2.0.5
-%global nickname TRANSPORTER
+%global nickname BORG
 
 %global build_python_package 0
 %global build_server_package 0
@@ -12,13 +12,13 @@
 # Licensing Note: The code is GPLv3+ and the IDL files are public domain.
 
 Name: openchange
-Version: 0.11
-Release: 4%{?dist}
+Version: 1.0
+Release: 1%{?dist}
 Group: Applications/System
 Summary: Provides access to Microsoft Exchange servers using native protocols
 License: GPLv3+ and Public Domain
 URL: http://www.openchange.org/
-Source0: http://downloads.sourceforge.net/openchange/openchange-%{version}-%{nickname}.tar.gz
+Source0: http://tracker.openchange.org/attachments/download/180/openchange-%{version}-%{nickname}.tar.gz
 Source1: doxygen_to_devhelp.xsl
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -53,12 +53,6 @@ Patch0: libmapi-0.8.2-libmapi-conflict.patch
 # RH bug #552984
 Patch1: openchange-0.9-generate-xml-doc.patch
 
-# http://tracker.openchange.org/issues/366
-Patch2: openchange-0.11-session-as-memctx.patch
-
-# http://tracker.openchange.org/issues/367
-Patch3: openchange-0.11-pt-mv-unicode.patch
-
 %description
 OpenChange provides libraries to access Microsoft Exchange servers
 using native protocols.
@@ -116,8 +110,6 @@ This package provides the server elements for OpenChange.
 %setup -q -n %{name}-%{version}-%{nickname}
 %patch0 -p1 -b .libmapi-conflict
 %patch1 -p1 -b .generate-xml-doc
-%patch2 -p1 -b .session-as-memctx
-%patch3 -p1 -b .pt-mv-unicode
 
 %build
 %configure
@@ -248,6 +240,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Mar 19 2012 Milan Crha <mcrha at redhat.com> - 1.0-1
+- Update to 1.0
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 4d7915f..1fd0e80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e5d2de7399f429048390a04aa8c5e79  openchange-0.11-TRANSPORTER.tar.gz
+9b57a325e90e5ad3a702ddc6e8762ab6  openchange-1.0-BORG.tar.gz

More information about the scm-commits mailing list