OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution-data-server?expand=0&rev=43

bgo-530514-check-to-handle-specific-server-response.diff

@@ -1,13 +0,0 @@
-Index: camel/providers/groupwise/camel-groupwise-folder.c
-===================================================================
---- camel/providers/groupwise/camel-groupwise-folder.c.orig
-+++ camel/providers/groupwise/camel-groupwise-folder.c
-@@ -1351,7 +1351,7 @@ gw_update_cache (CamelFolder *folder, GL
- 				str = g_string_append (str, " ");
- 			}
- 
--                        if (org->display_name[0] == '\0') { 
-+                        if (org->display_name && org->display_name[0] == '\0') {
- 
- 				str = g_string_append (str, org->email);
- 				str = g_string_append (str, " ");

bnc-164367-gw-attachments-appts-throw-error.patch

@@ -1,16 +0,0 @@
-=== modified file 'calendar/backends/groupwise/e-cal-backend-groupwise-utils.c'
---- calendar/backends/groupwise/e-cal-backend-groupwise-utils.c	2007-12-18 16:36:30 +0000
-+++ calendar/backends/groupwise/e-cal-backend-groupwise-utils.c	2007-12-18 16:41:31 +0000
-@@ -300,9 +300,10 @@
- 		/* FIXME the member does not follow the naming convention.
- 		 * Should be fixed in e-gw-item*/
- 		attach_item->contentType = g_strdup (gnome_vfs_get_mime_type (attach_filename_full));
-+
-+		attach_item->name = g_strdup (filename + strlen(uid) + 1);
- 		g_free (attach_filename_full);
- 
--		attach_item->name = g_strdup (filename + strlen(uid) + 1);
- 		/* do a base64 encoding so it can be embedded in a soap
- 		 * message */
- 		encoded_data = g_base64_encode (file_contents, file_len);
-

evolution-data-server-configure.patch

@@ -1,13 +0,0 @@
-=== modified file 'configure.in'
---- configure.in	2007-12-18 16:36:30 +0000
-+++ configure.in	2007-12-18 16:37:20 +0000
-@@ -396,6 +396,8 @@
- ])
- AC_MSG_RESULT($ac_cv_lkstrftime)
- 
-+PKG_PROG_PKG_CONFIG
-+
- dnl ********************************************************************************
- dnl security extension support (SSL and S/MIME)
- dnl
-

evolution-data-server.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sat Oct 25 22:07:50 IST 2008 - msuman@suse.de
+
+- Use evoldap2-client only for SUSE versions above 11.0, fallback to 
+  openldap2-client for the older versions.
+- Use proper RPM macros in the spec file, clean up spec file to reduce the 
+  number of warnings generated by rpmlint.
+- Dropped the following patches: 
+  + evolution-data-server-configure.patch - not required anymore.
+  + bnc-164367-gw-attachments-appts-throw-error.patch. Fixed upstream.
+  + bgo-530514-check-to-handle-specific-server-response.diff. Fixed upstream.
+  + libgnomeui-dep.patch - not required anymore, SUSE has moved away from
+    /opt/gnome
+
 -------------------------------------------------------------------
 Fri Oct 24 10:11:54 IST 2008 - msuman@suse.de
 

evolution-data-server.spec

@@ -34,39 +34,38 @@ BuildRequires:  libgnome-devel
 BuildRequires:  libidl-devel
 BuildRequires:  libsoup-devel
 BuildRequires:  mozilla-nss-devel
-BuildRequires:  evoldap2-devel
 BuildRequires:  perl-XML-Parser
 BuildRequires:  python-devel
 BuildRequires:  sgml-skel
 BuildRequires:  sqlite3-devel
+%if %suse_version > 1100
+BuildRequires:  evoldap2-devel
+%else
+BuildRequires:  openldap2-devel
+%endif
 License:        GPL v2 or later
 Group:          Development/Libraries/GNOME
 AutoReqProv:    on
 Summary:        Evolution Data Server
 Version:        2.24.1
-Release:        1
+Release:        2
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.24/%{name}-%{version}.tar.bz2
-Patch0:         evolution-data-server-configure.patch
-# PATCH-NEEDS-REBASE bnc-164367-gw-attachments-appts-throw-error.patch bnc164367 -- was PATCH-FIX-UPSTREAM, and may be droppable
-Patch1:         bnc-164367-gw-attachments-appts-throw-error.patch
 # PATCH-FIX-UPSTREAM evolution-data-server-1.11.5-cert-auth-complete.patch bgo253574 -- Fix has been submitted to bgo.
 Patch3:         evolution-data-server-1.11.5-cert-auth-complete.patch
 # PATCH-FIX-UPSTREAM bnc-304835-ex-crash-after-restart.patch bnc304835 bgo253574 -- Fix has been submitted to bgo.
 Patch4:         bnc-304835-ex-crash-after-restart.patch
 # PATCH-FIX-UPSTREAM bnc-307861-calendar-auth.diff -- bnc307861 bgo253574 -- Fix has been submitted to bgo.
 Patch5:         bnc-307861-calendar-auth.diff 
-# PATCH-FIX-UPSTREAM bgo-530514-check-to-handle-specific-server-response.diff bgo530514 psankar@suse.de -- Fix is in upstream svn from 2.22.2
-Patch9:         bgo-530514-check-to-handle-specific-server-response.diff
-# Change patch below if we move away from /opt/gnome
-# PATCH-FIX-OPENSUSE libgnomeui-dep.patch -- It avoids a build dependency on libgnomeui to speed up bootstrap
-Patch99:        libgnomeui-dep.patch
 # This patch contains changes in the core code base for the MAPI provider. 
 Patch100:       eds-core-mapi-changes.diff
 Url:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires:       libsoup >= 2.2.6 mozilla-nss
 Requires:       %{name}-lang = %{version}
+Requires:       libsoup >= 2.2.6
+Requires:       mozilla-nss
+%if %suse_version > 1100
 Requires:       evoldap2-devel
+%endif
 
 %description
 Evolution Data Server provides a central location for your address book
@@ -79,14 +78,26 @@ License:        GPL v2 or later
 Summary:        Evolution Data Server Development Files
 Group:          Development/Libraries/GNOME
 Requires:       evolution-data-server = %{?epoch:}%{version}-%{release}
-Requires:       libgpg-error-devel libsoup-devel libbonobo-devel libgnome-devel gnome-vfs2-devel libxml2-devel orbit2-devel evoldap2-devel libglade2-devel
+Requires:       gconf2-devel
-Requires:       gtk2-devel gconf2-devel glib2-devel gnome-keyring-devel gnome-certauth-devel
+Requires:       glib2-devel
-Requires:       sqlite3-devel
+Requires:       gnome-certauth-devel
-%if %suse_version >= 930
+Requires:       gnome-keyring-devel
+Requires:       gnome-vfs2-devel
+Requires:       gtk2-devel
 Requires:       krb5-devel
-%endif
+Requires:       libbonobo-devel
-%if %suse_version >= 1000
 Requires:       libcom_err
+Requires:       libglade2-devel
+Requires:       libgnome-devel
+Requires:       libgpg-error-devel
+Requires:       libsoup-devel
+Requires:       libxml2-devel
+Requires:       orbit2-devel
+Requires:       sqlite3-devel
+%if %suse_version > 1100
+Requires:       evoldap2-devel
+%else
+Requires:       openldap2-devel
 %endif
 
 %description devel
@@ -113,45 +124,39 @@ documentation.
 %lang_package
 %prep
 %setup -q
-%patch0
-# %patch1
 ###%patch3
 ###%patch4
 ###%patch5
-%patch9
-%patch99
 %patch100 -p1
 
 %build
-intltoolize --force --copy
-# should use autoreconf, but libdb is broken
-libtoolize --force --copy
-aclocal
-autoconf
-automake -a
-autoheader
-(cd calendar/libical; autoreconf -fi)
-# needed for evolution-data-server-2.22.0:
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-%configure \
+export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-    --libexecdir=%{_prefix}/lib/evolution-data-server \
+export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+%{configure} \
+    --libexecdir=%{_libdir}/evolution-data-server \
+%if %suse_version > 1100
     --with-openldap=%{_libdir}/evoldap \
-    --with-krb5=/usr \
+%else
-    --with-krb4=/usr \
+    --with-openldap=yes \
+%endif
+    --with-krb5=%{_prefix} \
+    --with-krb4=%{_prefix} \
     --enable-gnome-keyring \
     --enable-gtk-doc \
+    --enable-ipv6=yes \
     --enable-ssl
-make %{?jobs:-j%jobs}
+%{__make} %{?jobs:-j%jobs}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%{__make} DESTDIR=$RPM_BUILD_ROOT install
 %find_lang evolution-data-server-2.24
-rm $RPM_BUILD_ROOT/%{_libdir}/*.*a
+%{__rm} $RPM_BUILD_ROOT/%{_libdir}/*.*a
-rm $RPM_BUILD_ROOT/%{_libdir}/*/*/*.*a
+%{__rm} $RPM_BUILD_ROOT/%{_libdir}/*/*/*.*a
 %fdupes $RPM_BUILD_ROOT
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
@@ -165,7 +170,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/evolution-data-server
 %{_libdir}/*.so.*
 %{_libdir}/bonobo/servers/*
-%{_prefix}/lib/evolution-data-server
+%{_libdir}/evolution-data-server
 %{_libdir}/evolution-data-server-1.2
 
 %files lang -f evolution-data-server-2.24.lang
@@ -181,6 +186,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Sat Oct 25 2008 msuman@suse.de
+- Use evoldap2-client only for SUSE versions above 11.0, fallback to
+  openldap2-client for the older versions.
+- Use proper RPM macros in the spec file, clean up spec file to reduce the
+  number of warnings generated by rpmlint.
+- Dropped the following patches:
+  + evolution-data-server-configure.patch - not required anymore.
+  + bnc-164367-gw-attachments-appts-throw-error.patch. Fixed upstream.
+  + bgo-530514-check-to-handle-specific-server-response.diff. Fixed upstream.
+  + libgnomeui-dep.patch - not required anymore, SUSE has moved away from
+  /opt/gnome
 * Fri Oct 24 2008 msuman@suse.de
 - Update to version 2.24.1
   + Bugs fixed: bgo#337479, bgo#364542, bgo#497928, bgo#511947,

libgnomeui-dep.patch

@@ -1,13 +0,0 @@
-=== modified file 'configure.in'
---- configure.in	2007-12-18 18:57:46 +0000
-+++ configure.in	2007-12-18 19:02:54 +0000
-@@ -1367,7 +1367,7 @@
- AC_SUBST(IDL_INCLUDES)
- 
- AC_MSG_CHECKING(for libgnomeui server directory)
--GNOMEUI_SERVERDIR="`$PKG_CONFIG --variable=libgnomeui_serverdir libgnomeui-2.0`"
-+GNOMEUI_SERVERDIR="/opt/gnome/lib/libgnomeui"
- AC_MSG_RESULT($GNOMEUI_SERVERDIR)
- AC_DEFINE_UNQUOTED(GNOMEUI_SERVERDIR, "$GNOMEUI_SERVERDIR", [Path where we can find gnome_segv2])
- 
-