rpms/evolution-data-server/devel evolution-data-server-1.7.4-with-libdb-fix.patch, 1.2, 1.3 .cvsignore, 1.47, 1.48 evolution-data-server.spec, 1.106, 1.107 sources, 1.47, 1.48

[fedora-cvs-commits redhat com]

Author: mbarnes

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10575

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Added Files:
	evolution-data-server-1.7.4-with-libdb-fix.patch 
Log Message:
- Revert to version 1.7.4 to prevent API/ABI breakage.
- Add back patch to make --with-libdb configure option work.


evolution-data-server-1.7.4-with-libdb-fix.patch:
 backends/groupwise/Makefile.am |    1 -
 libedata-book/Makefile.am      |    3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

Index: evolution-data-server-1.7.4-with-libdb-fix.patch
===================================================================
RCS file: evolution-data-server-1.7.4-with-libdb-fix.patch
diff -N evolution-data-server-1.7.4-with-libdb-fix.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ evolution-data-server-1.7.4-with-libdb-fix.patch	31 Jul 2006 19:48:55 -0000	1.3
@@ -0,0 +1,22 @@
+--- evolution-data-server-1.7.4/addressbook/libedata-book/Makefile.am.with-libdb-fix	2006-07-19 12:40:29.000000000 -0400
++++ evolution-data-server-1.7.4/addressbook/libedata-book/Makefile.am	2006-07-19 12:40:53.000000000 -0400
+@@ -50,8 +50,7 @@
+ libedata_book_1_2_la_LIBADD =					\
+ 	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
+ 	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
+-	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
+-	$(top_builddir)/libdb/dist/libdb-4.1.la
++	$(top_builddir)/libedataserver/libedataserver-1.2.la
+ 
+ libedata_book_1_2_la_LDFLAGS = \
+ 	-version-info $(LIBEDATABOOK_CURRENT):$(LIBEDATABOOK_REVISION):$(LIBEDATABOOK_AGE) $(NO_UNDEFINED)
+--- evolution-data-server-1.7.4/addressbook/backends/groupwise/Makefile.am.with-libdb-fix	2006-07-19 12:40:11.000000000 -0400
++++ evolution-data-server-1.7.4/addressbook/backends/groupwise/Makefile.am	2006-07-19 12:40:53.000000000 -0400
+@@ -20,7 +20,6 @@
+ 	$(top_builddir)/addressbook/libebook/libebook-1.2.la		\
+ 	$(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la	\
+ 	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
+-	$(top_builddir)/libdb/dist/libdb-4.1.la				\
+ 	$(EVOLUTION_ADDRESSBOOK_LIBS)					\
+ 	$(SOUP_LIBS)
+ 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	26 Jul 2006 03:23:15 -0000	1.47
+++ .cvsignore	31 Jul 2006 19:48:55 -0000	1.48
@@ -1 +1 @@
-evolution-data-server-1.7.90.1.tar.bz2
+evolution-data-server-1.7.4.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- evolution-data-server.spec	31 Jul 2006 15:21:15 -0000	1.106
+++ evolution-data-server.spec	31 Jul 2006 19:48:55 -0000	1.107
@@ -21,8 +21,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 1.7.90.1
-Release: 4
+Version: 1.7.4
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -43,8 +43,11 @@
 
 Patch16: evolution-data-server-1.5.4-make_imap4_optional.patch
 
+# Gnome.org bug #344693
+Patch17: evolution-data-server-1.7.4-with-libdb-fix.patch
+
 # Gnome.org bug #348725
-Patch17: evolution-data-server-1.7.90.1-missing-function-decl.patch
+#Patch18: evolution-data-server-1.7.90.1-missing-function-decl.patch
 
 ### Dependencies ###
 
@@ -128,7 +131,8 @@
 %patch14 -p0 -b .fix-uid-leak
 %patch15 -p0 -b .fix-comp-ref-leak
 %patch16 -p1 -b .make_imap4_optional
-%patch17 -p1 -b .missing-function-decl
+%patch17 -p1 -b .with-libdb-fix
+#%patch18 -p1 -b .missing-function-decl
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -331,6 +335,10 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Jul 31 2006 Matthew Barnes <mbarnes redhat com> - 1.7.4-3
+- Revert to version 1.7.4 to prevent API/ABI breakage.
+- Add back patch to make --with-libdb configure option work.
+
 * Mon Jul 31 2006 Ray Strode <rstrode redhat com> - 1.7.90.1-4
 - add executable bits to libs 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	26 Jul 2006 03:23:15 -0000	1.47
+++ sources	31 Jul 2006 19:48:55 -0000	1.48
@@ -1 +1 @@
-07fa3db5725d41093b22d4e90c2ced87  evolution-data-server-1.7.90.1.tar.bz2
+b992845da75badd6eb5fecea022b5a50  evolution-data-server-1.7.4.tar.bz2