- merged from DEVEL

Changed files:
    evolution-data-server-system_db.patch -> 1.9
    evolution-data-server.spec -> 1.72

diff --git a/evolution-data-server-system_db.patch b/evolution-data-server-system_db.patch
index 2406e59d01267430f88b4e9d0de305415103073e..a55adecd1481f891b1017d7c7a0b6843027c8460 100644 (file)
--- a/evolution-data-server-system_db.patch
+++ b/evolution-data-server-system_db.patch
@@ -1,6 +1,31 @@
-diff -urN evolution-data-server-1.3.8.orig/addressbook/backends/file/Makefile.am evolution-data-server-1.3.8/addressbook/backends/file/Makefile.am
---- evolution-data-server-1.3.8.orig/addressbook/backends/file/Makefile.am     2005-08-23 11:04:40.302083616 +0200
-+++ evolution-data-server-1.3.8/addressbook/backends/file/Makefile.am  2005-08-23 11:05:46.385037480 +0200
+diff -aurN evolution-data-server-1.5.5.orig/Makefile.am evolution-data-server-1.5.5/Makefile.am
+--- evolution-data-server-1.5.5.orig/Makefile.am       2005-12-08 08:54:12.000000000 +0100
++++ evolution-data-server-1.5.5/Makefile.am    2006-01-22 21:07:02.287051000 +0100
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = 1.6
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+ 
+-SUBDIRS = libdb win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
++SUBDIRS = win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
+ DIST_SUBDIRS= win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
+ 
+ changelogs =                  \
+@@ -27,9 +27,10 @@
+       intltool-update.in                              \
+       intltool-extract.in                             \
+       evolution-data-server-zip.in                    \
+-      $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)     \
+-      $(LIBDB_FILES)
++      $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)
+ 
++# files below should be removed due to system db patch, but they are left
++# so patch is small
+ DISTCLEANFILES = intltool-extract intltool-merge intltool-update iconv-detect.h $(pkgconfig_DATA)
+ distclean-local:
+       (cd libdb && $(MAKE) $(AM_MAKEFLAGS) distclean)
+diff -aurN evolution-data-server-1.5.5.orig/addressbook/backends/file/Makefile.am evolution-data-server-1.5.5/addressbook/backends/file/Makefile.am
+--- evolution-data-server-1.5.5.orig/addressbook/backends/file/Makefile.am     2005-06-22 14:34:21.000000000 +0200
++++ evolution-data-server-1.5.5/addressbook/backends/file/Makefile.am  2006-01-22 21:02:28.917051000 +0100
 @@ -4,7 +4,6 @@
        -I$(top_builddir)                               \
        -I$(top_srcdir)/addressbook                     \
@@ -20,10 +45,10 @@ diff -urN evolution-data-server-1.3.8.orig/addressbook/backends/file/Makefile.am
  
  libebookbackendfile_la_LDFLAGS =      \
        -module -avoid-version $(NO_UNDEFINED)
-diff -urN evolution-data-server-1.3.8.orig/configure.in evolution-data-server-1.3.8/configure.in
---- evolution-data-server-1.3.8.orig/configure.in      2005-08-23 11:04:38.291389288 +0200
-+++ evolution-data-server-1.3.8/configure.in   2005-08-23 11:05:46.387037176 +0200
-@@ -1253,7 +1253,6 @@
+diff -aurN evolution-data-server-1.5.5.orig/configure.in evolution-data-server-1.5.5/configure.in
+--- evolution-data-server-1.5.5.orig/configure.in      2006-01-17 09:48:52.000000000 +0100
++++ evolution-data-server-1.5.5/configure.in   2006-01-22 21:03:31.387051000 +0100
+@@ -1270,7 +1270,6 @@
  export privincludedir
  export privdatadir
  AC_CONFIG_SUBDIRS(calendar/libical)
@@ -31,7 +56,7 @@ diff -urN evolution-data-server-1.3.8.orig/configure.in evolution-data-server-1.
  
  AC_OUTPUT([
  Makefile
-@@ -1308,7 +1307,6 @@
+@@ -1328,7 +1327,6 @@
  camel/tests/stream/Makefile
  camel/camel.pc
  camel/camel-provider.pc
@@ -39,18 +64,18 @@ diff -urN evolution-data-server-1.3.8.orig/configure.in evolution-data-server-1.
  libedataserver/Makefile
  libedataserver/libedataserver.pc
  libedataserverui/Makefile
-diff -urN evolution-data-server-1.3.8.orig/libedataserver/Makefile.am evolution-data-server-1.3.8/libedataserver/Makefile.am
---- evolution-data-server-1.3.8.orig/libedataserver/Makefile.am        2005-08-23 11:04:40.526049568 +0200
-+++ evolution-data-server-1.3.8/libedataserver/Makefile.am     2005-08-23 11:06:56.983304912 +0200
+diff -aurN evolution-data-server-1.5.5.orig/libedataserver/Makefile.am evolution-data-server-1.5.5/libedataserver/Makefile.am
+--- evolution-data-server-1.5.5.orig/libedataserver/Makefile.am        2006-01-16 09:43:14.000000000 +0100
++++ evolution-data-server-1.5.5/libedataserver/Makefile.am     2006-01-22 21:05:44.877051000 +0100
 @@ -1,7 +1,6 @@
  INCLUDES =                                                            \
        -I$(top_srcdir)                                                 \
        -DG_LOG_DOMAIN=\"e-data-server\"                                \
 -      -I$(top_srcdir)/libdb/dist                                      \
+       -DE_DATA_SERVER_PREFIX=\"$(prefix)\"                            \
+       -DEVOLUTION_LOCALEDIR=\""$(localedir)"\"                        \
        -DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\"                \
-       -DE_DATA_SERVER_IMAGESDIR=\"$(imagesdir)\"                      \
-       $(E_DATA_SERVER_CFLAGS)
-@@ -44,7 +43,7 @@
+@@ -49,7 +48,7 @@
  libedataserver_1_2_la_LIBADD =                                \
        $(E_DATA_SERVER_LIBS)                           \
        $(ICONV_LIBS)                                   \
@@ -59,28 +84,3 @@ diff -urN evolution-data-server-1.3.8.orig/libedataserver/Makefile.am evolution-
        $(SOCKET_LIBS)
  
  libedataserver_1_2_la_LDFLAGS = \
-diff -urN evolution-data-server-1.3.8.orig/Makefile.am evolution-data-server-1.3.8/Makefile.am
---- evolution-data-server-1.3.8.orig/Makefile.am       2005-08-23 11:04:40.203098664 +0200
-+++ evolution-data-server-1.3.8/Makefile.am    2005-08-23 11:05:46.390036720 +0200
-@@ -1,7 +1,7 @@
- AUTOMAKE_OPTIONS = 1.6
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
- 
--SUBDIRS = libdb libedataserver servers camel addressbook calendar libedataserverui src docs art po
-+SUBDIRS = libedataserver servers camel addressbook calendar libedataserverui src docs art po
- DIST_SUBDIRS= libedataserver servers camel addressbook calendar libedataserverui src docs art po
- 
- changelogs =                  \
-@@ -26,9 +26,10 @@
-       intltool-merge.in                               \
-       intltool-update.in                              \
-       intltool-extract.in                             \
--      $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)     \
--      $(LIBDB_FILES)
-+      $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)
- 
-+# files below should be removed due to system db patch, but they are left,
-+# so patch is small
- DISTCLEANFILES = intltool-extract intltool-merge intltool-update iconv-detect.h $(pkgconfig_DATA)
- distclean-local:
-       (cd libdb && $(MAKE) $(AM_MAKEFLAGS) distclean)

diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 73544b3ac94de4057aefcd258fd96324419abfab..74aecbcb566278b2b9d9a0db25221c5a40317434 100644 (file)
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -6,22 +6,21 @@
 %bcond_without kerberos5       # build without kerberos5 support
 %bcond_without ldap            # build without ldap support
 #
-%define                basever         1.4
+%define                basever         1.6
 %define                apiver          1.2
 Summary:       Evolution data server
 Summary(pl):   Serwer danych Evolution
 Name:          evolution-data-server
-Version:       1.4.2.1
-Release:       3
+Version:       1.6.0
+Release:       1
 License:       GPL
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.4/%{name}-%{version}.tar.bz2
-# Source0-md5: 8b058aff089cf3a6c13cc9f51f536ae8
+Source0:       http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.6/%{name}-%{version}.tar.bz2
+# Source0-md5: 1d775148a4f88559cb375924b9f7b79f
 Patch0:                %{name}-system_db.patch
 Patch1:                %{name}-GG-IM.patch
 Patch2:                %{name}-workaround-cal-backend-leak.patch
 Patch3:                %{name}-gcc4.patch
-Patch4:                %{name}-imap-encoding.patch
 URL:           http://www.ximian.com/products/ximian_evolution/
 BuildRequires: ORBit2-devel >= 1:2.12.1
 BuildRequires: autoconf >= 2.52
@@ -30,7 +29,6 @@ BuildRequires:        bison
 BuildRequires: db-devel
 BuildRequires: gnome-common >= 2.8.0
 %{?with_kerberos5:BuildRequires:       heimdal-devel >= 0.7}
-BuildRequires: howl-devel >= 0.9.10
 BuildRequires: intltool
 BuildRequires: libglade2-devel >= 1:2.5.1
 BuildRequires: libgnomeui-devel >= 2.11.2-2
@@ -121,7 +119,6 @@ Statyczne biblioteki serwera danych Evolution.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p0
 
 rm -rf libdb