OBS User unknown 2008-02-03 23:23:02 +00:00 committed by Git OBS Bridge
parent b498f79c23
commit fdff91f332
6 changed files with 86 additions and 49 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:458a1696ee51d88a51d32c711e4bb05fbcc38206e25f72b723e29f368348fa22
size 7531723

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f45447b47cd0e2943a5a6d548f9445631371d345064ecd38769584a6cec576d6
size 7486702

View File

@ -0,0 +1,16 @@
Index: evolution-data-server-2.21.90/addressbook/backends/groupwise/e-book-backend-groupwise.c
===================================================================
--- evolution-data-server-2.21.90.orig/addressbook/backends/groupwise/e-book-backend-groupwise.c
+++ evolution-data-server-2.21.90/addressbook/backends/groupwise/e-book-backend-groupwise.c
@@ -2422,11 +2422,6 @@ find_book_view (EBookBackendGroupwise *e
EIterator *iter;
EDataBookView *rv = NULL;
- if (!iter) {
- g_object_unref (views);
- return NULL;
- }
-
if (!views)
return NULL;

View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Thu Jan 31 09:35:14 CST 2008 - maw@suse.de
- Update to version 2.21.90:
+ Speed up spam filtering and spam whitelist implementation
+ Bugs fixed: bgo#213072, bgo#213072, bgo#300098, bgo#324168,
bgo#335217, bgo#386157, bgo#445309, bgo#450840, bgo#456019,
bgo#475781, bgo#481699, bgo#482940, bgo#496081, bgo#498977,
bgo#506250, bgo#509124, bgo#509644, bgo#509985, bgo#510168,
bgo#510303, bgo#510409, bgo#511235, bgo#511301, and
bgo#511717
+ Camel mime fixes
+ Implement byte order for win32
+ Changed error message to a better string
+ Remove unused libsoup includes and update for libsoup 2.4
+ Adapt to newer libsoup
- Remove libtool archives and static libraries
- Remove evolution-password-dialogs.patch which is no longer
necessary.
-------------------------------------------------------------------
Wed Jan 16 20:27:24 CET 2008 - maw@suse.de

View File

@ -1,5 +1,5 @@
#
# spec file for package evolution-data-server (Version 2.21.5)
# spec file for package evolution-data-server (Version 2.21.90)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -16,9 +16,9 @@ License: GPL v2 or later
Group: Development/Libraries/GNOME
AutoReqProv: on
Summary: Evolution Data Server
Version: 2.21.5
Version: 2.21.90
Release: 1
Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.11/%{name}-%{version}.tar.bz2
Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.21/%{name}-%{version}.tar.bz2
Patch0: evolution-data-server-configure.patch
Patch1: evolution-data-server-decl.patch
Patch2: eds-warnings.patch
@ -27,12 +27,16 @@ Patch4: bnc-163982-system-hang-with-126-error-popups.patch
Patch5: bnc-152070-eds-crash.patch
Patch6: bnc-164140-eds-crash-evolution--offline.patch
Patch7: bnc-167638.patch
# PATCH-NEEDS-REBASE: bnc-174255-honour-system-proxy-settings.patch
Patch8: bnc-174255-honour-system-proxy-settings.patch
Patch9: bnc-183819-evo-crashed-closing-offline.patch
Patch10: eds-compiler-warning.patch
# PATCH-NEEDS-REBASE: evolution-data-server-1.11.5-cert-auth-complete.patch
Patch11: evolution-data-server-1.11.5-cert-auth-complete.patch
# PATCH-NEEDS-REBASE: bnc-304835-ex-crash-after-restart.patch
Patch12: bnc-304835-ex-crash-after-restart.patch
Patch13: bnc-307861-calendar-auth.diff
Patch14: evolution-data-server-abuild.patch
# Change patch below if we move away from /opt/gnome
# It avoids a build dependency on libgnomeui to speed up bootstrap
Patch99: libgnomeui-dep.patch
@ -43,8 +47,6 @@ Patch99: libgnomeui-dep.patch
# W: evolution-data-server uninitialized-variable e-book-backend-groupwise.c: 2425
# See:
# http://bugzilla.gnome.org/show_bug.cgi?id=504346
# this will be unnecessary as of 2.21.5.1 or later
Patch1000: evolution-password-dialogs.patch
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: libsoup >= 2.2.6 mozilla-nss
@ -60,7 +62,7 @@ and calendar in the GNOME Desktop.
Summary: Evolution Data Server Development Files
Group: Development/Libraries/GNOME
Requires: evolution-data-server = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: alsa-devel libesd-devel libgcrypt-devel libgnutls-devel libgpg-error-devel libsoup-devel libbonobo-devel libgnome-devel gnome-vfs2-devel libxml2-devel orbit2-devel openldap2-devel libglade2-devel
Requires: libgpg-error-devel libsoup-devel libbonobo-devel libgnome-devel gnome-vfs2-devel libxml2-devel orbit2-devel openldap2-devel libglade2-devel
Requires: gtk2-devel gconf2-devel glib2-devel gnome-keyring-devel gnome-certauth-devel
%if %suse_version >= 930
Requires: krb5-devel
@ -100,14 +102,14 @@ documentation.
%patch5
%patch6
%patch7
%patch8
###%patch8
%patch9
%patch10
%patch11
%patch12
###%patch11
###%patch12
%patch13
%patch14 -p1
%patch99
%patch1000 -p1
%build
libtoolize --force --copy
@ -130,7 +132,8 @@ make %{?jobs:-j%jobs}
%install
make DESTDIR=$RPM_BUILD_ROOT install
%find_lang evolution-data-server-2.22
rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a
rm $RPM_BUILD_ROOT/%{_libdir}/*.*a
rm $RPM_BUILD_ROOT/%{_libdir}/*/*/*.*a
%fdupes $RPM_BUILD_ROOT
%clean
@ -157,7 +160,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-, root, root)
%{_includedir}/evolution-data-server-2.22
%{_libdir}/*.so
%{_libdir}/*.*a
%{_libdir}/pkgconfig/*.pc
%files doc
@ -165,6 +167,23 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/*
%changelog
* Thu Jan 31 2008 maw@suse.de
- Update to version 2.21.90:
+ Speed up spam filtering and spam whitelist implementation
+ Bugs fixed: bgo#213072, bgo#213072, bgo#300098, bgo#324168,
bgo#335217, bgo#386157, bgo#445309, bgo#450840, bgo#456019,
bgo#475781, bgo#481699, bgo#482940, bgo#496081, bgo#498977,
bgo#506250, bgo#509124, bgo#509644, bgo#509985, bgo#510168,
bgo#510303, bgo#510409, bgo#511235, bgo#511301, and
bgo#511717
+ Camel mime fixes
+ Implement byte order for win32
+ Changed error message to a better string
+ Remove unused libsoup includes and update for libsoup 2.4
+ Adapt to newer libsoup
- Remove libtool archives and static libraries
- Remove evolution-password-dialogs.patch which is no longer
necessary.
* Wed Jan 16 2008 maw@suse.de
- Add evolution-password-dialogs.patch (bgo #509644).
* Mon Jan 14 2008 maw@suse.de
@ -190,7 +209,7 @@ rm -rf $RPM_BUILD_ROOT
+ Updated translations
+ Protect against a NULL subject string
- Remove old patches, and refresh and renumber the remaining ones.
* Wed Dec 05 2007 maw@suse.de
* Tue Dec 04 2007 maw@suse.de
- Don't require openldap2 to build.
* Thu Oct 11 2007 sbrabec@suse.cz
- Removed bogus dependency on mDNSResponder.
@ -201,7 +220,7 @@ rm -rf $RPM_BUILD_ROOT
+ Bug (bugzilla.novell.com) fixed: #275990
+ Updated timezone info
+ Updated translations.
* Sat Sep 15 2007 maw@suse.de
* Fri Sep 14 2007 maw@suse.de
- Fix bnc-307861-calendar-auth.diff.
* Fri Sep 14 2007 pchenthill@novell.com
- evolution-data-server-1.11.5-cert-auth-complete.patch: Updated the
@ -262,7 +281,7 @@ rm -rf $RPM_BUILD_ROOT
* Fri Jun 22 2007 sbrabec@suse.cz
- Fixed IMAP UID format string vulnerability (#284828,
GNOME#447414, CVE-2007-3257).
* Thu May 24 2007 ro@suse.de
* Wed May 23 2007 ro@suse.de
- added ldconfig to post scripts
* Wed Apr 11 2007 maw@suse.de
- Update to version 1.10.1
@ -327,7 +346,7 @@ rm -rf $RPM_BUILD_ROOT
- update to 1.8.0:
* updated translation
* bugfixes
* Sat Aug 19 2006 jhargadon@suse.de
* Fri Aug 18 2006 jhargadon@suse.de
- update to version 1.7.91
- Add filters to Groupwise SOAP calls so that each component
fetches items of its own type and none other
@ -340,10 +359,10 @@ rm -rf $RPM_BUILD_ROOT
- Support for Gadu Gadu IM in Contact Entries
- Memory reduction and Performance improvements in Contacts
- Removed patches that were incorporated upstream.
* Thu Jul 20 2006 kharish@novell.com
* Wed Jul 19 2006 kharish@novell.com
- Patch to add alarms to GW meetings by default based on customer
preference. Fixes bnc 167330.
* Wed Jul 19 2006 kharish@novell.com
* Tue Jul 18 2006 kharish@novell.com
- Patch to correctly handle calendar attachment filenames that do
not require special characters handling. They were being parsed
incorrectly and ignored by clients.
@ -387,7 +406,7 @@ rm -rf $RPM_BUILD_ROOT
* Thu May 25 2006 sragavan@novell.com
- Fixes (bnc)
176615 - Added a new camel stream vfs for saving to remote shares.
* Tue May 23 2006 sragavan@novell.com
* Mon May 22 2006 sragavan@novell.com
- Updated translations (Srini)
* Mon May 22 2006 fejj@suse.de
- Added bnc-177394.patch to fix a crasher when an IMAP server replies
@ -573,7 +592,7 @@ rm -rf $RPM_BUILD_ROOT
* Thu Oct 13 2005 gekker@suse.de
- Update to version 1.4.1
- Fix more warnings
* Mon Sep 26 2005 ro@suse.de
* Sun Sep 25 2005 ro@suse.de
- added LDAP_DEPRECATED to CFLAGS
* Fri Sep 09 2005 aj@suse.de
- Change last patch.
@ -587,13 +606,13 @@ rm -rf $RPM_BUILD_ROOT
- Fix brokeness inlibical
* Sat Aug 13 2005 aj@suse.de
- Add lzo and lzo-devel to nfb.
* Fri Aug 12 2005 gekker@suse.de
* Thu Aug 11 2005 gekker@suse.de
- Update to version 1.3.7
* Mon Aug 01 2005 gekker@suse.de
- Update to version 1.3.6.1
* Fri Jul 29 2005 sbrabec@suse.cz
- Require mozilla-nss (#98002).
* Wed Jul 27 2005 ro@suse.de
* Tue Jul 26 2005 ro@suse.de
- fix typo in specfile
* Mon Jul 25 2005 gekker@suse.de
- Update to version 1.3.5
@ -613,7 +632,7 @@ rm -rf $RPM_BUILD_ROOT
- Build with mozilla-nss.
* Wed Jun 01 2005 sbrabec@suse.cz
- Fixed devel requirements.
* Thu May 19 2005 ro@suse.de
* Wed May 18 2005 ro@suse.de
- fix build with current pkgconfig
* Fri Apr 29 2005 sbrabec@suse.cz
- Yet another mail crasher fix (#66996).
@ -668,12 +687,12 @@ rm -rf $RPM_BUILD_ROOT
- locale rename: no -> nb
* Thu Sep 30 2004 dobey@suse.de
- Add patch to fix bug 66368 in bugzilla.ximian.com
* Thu Sep 30 2004 dobey@suse.de
* Wed Sep 29 2004 dobey@suse.de
- Add patch to fix bug 66230 in bugzilla.ximian.com
* Fri Sep 24 2004 dobey@suse.de
- Updated to version 1.0.1
- Removed evolution-data-server-0.0.99.dif which is in upstream source
* Fri Sep 17 2004 ro@suse.de
* Thu Sep 16 2004 ro@suse.de
- readd evolution-data-server-0.0.99.dif to fix parallel build
* Mon Sep 13 2004 dobey@suse.de
- Updated to version 1.0.0
@ -703,13 +722,13 @@ rm -rf $RPM_BUILD_ROOT
- Updated to version 0.0.95.
* Mon Jun 21 2004 clahey@suse.de
- Updated to version 0.0.94.1.
* Fri Jun 04 2004 mibarra@suse.de
* Thu Jun 03 2004 mibarra@suse.de
- Updated to version 0.0.94.
* Mon May 24 2004 ro@suse.de
- fix lib64 issue
* Sat May 22 2004 mibarra@suse.de
* Fri May 21 2004 mibarra@suse.de
- Updated to 0.0.93.
* Tue May 18 2004 clahey@suse.de
- Don't install to /opt/gnome/libexec
* Tue May 18 2004 clahey@suse.de
* Mon May 17 2004 clahey@suse.de
- Initial import of evolution-data-server.

View File

@ -1,18 +0,0 @@
--- trunk/libedataserverui/e-passwords.c 2008/01/16 16:59:55 8378
+++ trunk/libedataserverui/e-passwords.c 2008/01/16 17:15:46 8379
@@ -873,12 +873,12 @@
widget = gtk_dialog_new_with_buttons (
msg->title, msg->parent, 0,
- GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_has_separator (GTK_DIALOG (widget), FALSE);
gtk_dialog_set_default_response (
- GTK_DIALOG (widget), GTK_RESPONSE_ACCEPT);
+ GTK_DIALOG (widget), GTK_RESPONSE_OK);
gtk_window_set_resizable (GTK_WINDOW (widget), FALSE);
gtk_container_set_border_width (GTK_CONTAINER (widget), 12);
password_dialog = GTK_DIALOG (widget);