rpms/openchange/devel .cvsignore, 1.3, 1.4 libmapi-0.8.2-libmapi-conflict.patch, 1.1, 1.2 openchange.spec, 1.10, 1.11 sources, 1.3, 1.4
Matthew Barnes
mbarnes at fedoraproject.org
Sun Dec 27 01:21:47 UTC 2009
Author: mbarnes
Update of /cvs/pkgs/rpms/openchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11558
Modified Files:
.cvsignore libmapi-0.8.2-libmapi-conflict.patch
openchange.spec sources
Log Message:
* Sat Dec 26 2009 Matthew Barnes <mbarnes at redhat.com> - 0.9-1
- Update to 0.9 (COCHRANE)
- Bump samba4 requirement to alpha10.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openchange/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 31 Mar 2009 14:56:51 -0000 1.3
+++ .cvsignore 27 Dec 2009 01:21:46 -0000 1.4
@@ -1 +1 @@
-libmapi-0.8.2-ROMULUS.tar.gz
+openchange-0.9-COCHRANE.tar.gz
libmapi-0.8.2-libmapi-conflict.patch:
Makefile | 58 +++++++++++++++++++++++++++++-----------------------------
libmapi.pc.in | 2 +-
2 files changed, 30 insertions(+), 30 deletions(-)
Index: libmapi-0.8.2-libmapi-conflict.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openchange/devel/libmapi-0.8.2-libmapi-conflict.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libmapi-0.8.2-libmapi-conflict.patch 29 Jun 2009 18:12:06 -0000 1.1
+++ libmapi-0.8.2-libmapi-conflict.patch 27 Dec 2009 01:21:46 -0000 1.2
@@ -1,6 +1,6 @@
-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
+diff -up openchange-0.9-COCHRANE/libmapi.pc.in.libmapi-conflict openchange-0.9-COCHRANE/libmapi.pc.in
+--- openchange-0.9-COCHRANE/libmapi.pc.in.libmapi-conflict 2009-08-05 15:20:11.000000000 -0400
++++ openchange-0.9-COCHRANE/libmapi.pc.in 2009-12-26 20:13:10.822358841 -0500
@@ -8,7 +8,7 @@ datadir=@datadir@
Name: MAPI
Description: MAPI Protocol Implementation
@@ -9,32 +9,31 @@ diff -up libmapi-0.8.2-ROMULUS/libmapi.p
+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
+ Requires: talloc dcerpc ndr tevent
+diff -up openchange-0.9-COCHRANE/Makefile.libmapi-conflict openchange-0.9-COCHRANE/Makefile
+--- openchange-0.9-COCHRANE/Makefile.libmapi-conflict 2009-12-26 20:13:29.489377427 -0500
++++ openchange-0.9-COCHRANE/Makefile 2009-12-26 20:15:25.697350350 -0500
+@@ -146,7 +146,7 @@ LIBMAPI_SO_VERSION = 0
libmapi: idl \
libmapi/version.h \
libmapi/proto.h \
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
-+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
++ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
libmapi-install: libmapi \
libmapi-installpc \
-@@ -179,8 +179,9 @@ endif
+@@ -188,8 +188,8 @@ 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) \
++ 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:
+@@ -206,10 +206,10 @@ libmapi-installpc:
libmapi-installlib:
@echo "[*] install: libmapi library"
$(INSTALL) -d $(DESTDIR)$(libdir)
@@ -42,10 +41,13 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
- 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)
+ ifeq ($(MANUALLY_CREATE_SYMLINKS), yes)
+- ln -sf libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
++ ln -sf libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
+ endif
libmapi-installheader:
- @echo "[*] install: libmapi headers"
-@@ -232,7 +233,7 @@ libmapi-uninstallpc:
+@@ -244,7 +244,7 @@ libmapi-uninstallpc:
rm -f $(DESTDIR)$(libdir)/pkgconfig/libmapi.pc
libmapi-uninstalllib:
@@ -54,7 +56,7 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
libmapi-uninstallheader:
rm -rf $(DESTDIR)$(includedir)/libmapi
-@@ -243,7 +244,7 @@ libmapi-uninstallscript:
+@@ -255,7 +255,7 @@ libmapi-uninstallscript:
rm -f $(DESTDIR)$(datadir)/setup/profiles/oc_profiles*
rm -rf $(DESTDIR)$(datadir)/setup/profiles
@@ -63,12 +65,12 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
libmapi/IABContainer.po \
libmapi/IProfAdmin.po \
libmapi/IMAPIContainer.po \
-@@ -285,10 +286,10 @@ libmapi.$(SHLIBEXT).$(PACKAGE_VERSION):
+@@ -297,10 +297,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)
+- @$(CC) $(DSOOPT) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION) -o $@ $^ $(LIBS)
++ @$(CC) $(DSOOPT) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION) -o $@ $^ $(LIBS)
-libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION): libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
@@ -76,16 +78,16 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
ln -fs $< $@
libmapi/version.h: VERSION
-@@ -399,7 +400,7 @@ libmapixx-test-clean:
+@@ -414,7 +414,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)
+ @$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
-@@ -412,7 +413,7 @@ libmapixx-attach-clean:
+@@ -427,7 +427,7 @@ libmapixx-attach-clean:
rm -f libmapi++/tests/*.o
bin/libmapixx-attach: libmapi++/tests/attach_test.cpp \
@@ -94,7 +96,16 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
@echo "Linking sample application $@"
@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
-@@ -431,14 +432,14 @@ libmapixx-messages-clean:
+@@ -436,7 +436,7 @@ clean:: libmapixx-attach-clean
+ libmapixx-exception: bin/libmapixx-exception
+
+ bin/libmapixx-exception: libmapi++/tests/exception_test.cpp \
+- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
++ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking exception test application $@"
+ @$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
+
+@@ -458,14 +458,14 @@ libmapixx-messages-clean:
rm -f libmapi++/examples/*.o
libmapi++/examples/foldertree: libmapi++/examples/foldertree.cpp \
@@ -111,25 +122,25 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
@echo "Linking messages example application $@"
@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
-@@ -506,7 +507,7 @@ libmapiadmin-uninstallheader:
+@@ -537,7 +537,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)
+ @$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiadmin.$(SHLIBEXT).$(LIBMAPIADMIN_SO_VERSION) -o $@ $^ $(LIBS) $(LIBMAPIADMIN_LIBS)
-@@ -586,7 +587,7 @@ libocpf.$(SHLIBEXT).$(PACKAGE_VERSION):
+@@ -621,7 +621,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)
+ @$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libocpf.$(SHLIBEXT).$(LIBOCPF_SO_VERSION) -o $@ $^ $(LIBS)
-@@ -667,7 +668,7 @@ torture/openchange.$(SHLIBEXT): \
+@@ -702,7 +702,7 @@ torture/openchange.$(SHLIBEXT): \
torture/mapi_namedprops.po \
torture/mapi_recipient.po \
torture/openchange.po \
@@ -138,43 +149,43 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
@echo "Linking $@"
@$(CC) -o $@ $(DSOOPT) $^ -L. $(LIBS)
-@@ -800,7 +801,7 @@ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PAC
+@@ -837,7 +837,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)
+ @$(CC) -o $@ $(DSOOPT) -Wl,-soname,libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ -L. $(LIBS) $(TDB_LIBS)
mapiproxy/libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION): libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
-@@ -1072,7 +1073,7 @@ clean:: openchangeclient-clean
+@@ -1127,7 +1127,7 @@ clean:: openchangeclient-clean
bin/openchangeclient: utils/openchangeclient.o \
utils/openchange-tools.o \
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) \
-+ libmapi-openchange.$(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
+ @$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
+@@ -1156,7 +1156,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
+ @$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
-@@ -1125,7 +1126,7 @@ clean:: openchangepfadmin-clean
+@@ -1184,7 +1184,7 @@ clean:: openchangepfadmin-clean
bin/openchangepfadmin: utils/openchangepfadmin.o \
utils/openchange-tools.o \
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) \
-+ libmapi-openchange.$(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
+@@ -1216,7 +1216,7 @@ clean:: exchange2mbox-clean
bin/exchange2mbox: utils/exchange2mbox.o \
utils/openchange-tools.o \
@@ -183,25 +194,25 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
@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 \
+@@ -1280,7 +1280,7 @@ bin/exchange2ical: utils/exchange2ical_t
+ libexchange2ical/ical2exchange.o \
+ libexchange2ical/ical2exchange_property.o \
utils/openchange-tools.o \
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking $@"
- @$(CC) -o $@ $^ $(LIBS) $(ICAL_LIBS) -lpopt
+ @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(ICAL_LIBS) -lpopt
-@@ -1236,7 +1237,7 @@ bin/mapitest: utils/mapitest/mapitest.o
- utils/mapitest/modules/module_noserver.o \
+@@ -1336,7 +1336,7 @@ bin/mapitest: utils/mapitest/mapitest.o
utils/mapitest/modules/module_errorchecks.o \
utils/mapitest/modules/module_lcid.o \
+ utils/mapitest/modules/module_mapidump.o \
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
-+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
++ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking $@"
@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
-@@ -1285,7 +1286,7 @@ clean:: openchangemapidump-clean
+@@ -1391,7 +1391,7 @@ clean:: openchangemapidump-clean
bin/openchangemapidump: utils/backup/openchangemapidump.o \
utils/backup/openchangebackup.o \
utils/openchange-tools.o \
@@ -210,7 +221,7 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
@echo "Linking $@"
@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
-@@ -1332,7 +1333,7 @@ locale_codepage-clean::
+@@ -1440,7 +1440,7 @@ locale_codepage-clean::
clean:: locale_codepage-clean
@@ -219,7 +230,7 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
@echo "Linking $@"
@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
-@@ -1346,7 +1347,7 @@ pymapi: $(pythonscriptdir)/mapi.$(SHLIBE
+@@ -1454,7 +1454,7 @@ pymapi: $(pythonscriptdir)/mapi.$(SHLIBE
pymapi/%: CFLAGS+=`$(PYTHON_CONFIG) --cflags` -fPIC
@@ -228,7 +239,7 @@ diff -up libmapi-0.8.2-ROMULUS/Makefile.
$(CC) -o $@ $^ `$(PYTHON_CONFIG) --libs` $(DSOOPT)
pymapi-install::
-@@ -1472,7 +1473,7 @@ clean::
+@@ -1580,7 +1580,7 @@ clean::
test:: check
Index: openchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openchange/devel/openchange.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- openchange.spec 23 Sep 2009 11:58:12 -0000 1.10
+++ openchange.spec 27 Dec 2009 01:21:46 -0000 1.11
@@ -1,21 +1,21 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define samba4_version 4.0.0-1.alpha7
+%define samba4_version 4.0.0-1.alpha10
%define talloc_version 1.2.0
-%define nickname ROMULUS
+%define nickname COCHRANE
### Abstract ###
# Licensing Note: The code is GPLv3+ and the IDL files are public domain.
Name: openchange
-Version: 0.8.2
-Release: 5%{?dist}
+Version: 0.9
+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/libmapi-%{version}-%{nickname}.tar.gz
+Source0: http://downloads.sourceforge.net/openchange/openchange-%{version}-%{nickname}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
### Build Dependencies ###
@@ -82,7 +82,7 @@ Requires: sqlite
This package provides the server elements for OpenChange.
%prep
-%setup -q -n libmapi-%{version}-%{nickname}
+%setup -q -n %{name}-%{version}-%{nickname}
%patch1 -p1 -b .libmapi-conflict
%build
@@ -153,6 +153,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/mapistore_backends/mapistore_sqlite3.so
%changelog
+* Sat Dec 26 2009 Matthew Barnes <mbarnes at redhat.com> - 0.9-1
+- Update to 0.9 (COCHRANE)
+- Bump samba4 requirement to alpha10.
+
* Wed Sep 23 2009 Matthew Barnes <mbarnes at redhat.com> - 0.8.2-5
- Rebuild.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openchange/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 31 Mar 2009 14:56:51 -0000 1.3
+++ sources 27 Dec 2009 01:21:46 -0000 1.4
@@ -1 +1 @@
-b956870860cd786a0793bd89783df185 libmapi-0.8.2-ROMULUS.tar.gz
+9dc6c91ea5d4afce4a5aa81215835b8b openchange-0.9-COCHRANE.tar.gz
More information about the scm-commits
mailing list