diff --git a/evolution-data-server-2.29.3.tar.bz2 b/evolution-data-server-2.29.3.tar.bz2 deleted file mode 100644 index ee4cb4c..0000000 --- a/evolution-data-server-2.29.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47fb9d84e279d80e2472fd73d00429b3c08631b19eff4d2997712233cb4c1bcf -size 4535529 diff --git a/evolution-data-server-2.29.4.tar.bz2 b/evolution-data-server-2.29.4.tar.bz2 new file mode 100644 index 0000000..42ee6d2 --- /dev/null +++ b/evolution-data-server-2.29.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:044496588f52af13b4edd9a70d88ee7c48e35119e8499345113f7904ac2ccbe8 +size 4539903 diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 82e290f..d6c0cae 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Sun Dec 27 15:47:54 CET 2009 - vuntz@opensuse.org + +- Rework packaging to make it easy to switch between using evoldap + and not using it, with a USE_EVOLDAP define. +- Do not use evoldap right now: the evoldap package doesn't seem to + be well-maintained. +- Remove perl-XML-Parser, sgml-skel BuildRequires. +- Remove orbit2-devel Requires of devel package. + +------------------------------------------------------------------- +Thu Dec 24 18:40:54 CET 2009 - vuntz@opensuse.org + +- Update to version 2.29.4: + + Mailer: + - bgo#604865 - Message part description shouldn't be translated + - bgo#553057 - Add information about signers to a validity + structure + - bgo#603342 - Memory leak fixes + - bgo#592317 - Sign S/MIME with valid certificates only + - bgo#604305 - Attachments not properly indicated in message + summary + - bgo#603689 - Improper escaping of folder name + - bgo#487988 - Bad search filter for LDAP address book + + Calendar: + - bgo#603437 - Fixes for valgrind reports on e-calendar-factory + - bgo#602945 - Avoid code duplication with timezone fetching + from backends + + Contacts: + - bgo#601513 - Crashes when trying to add a new contact in MAPI + + Misc: + - bgo#604550 - e_passwords_shutdown is buggy password_cache is + destroyed without properly acquiring the lock. + - bgo#603770 - Replace __PRETY_FUNCTION__ with G_STRFUNC + - bgo#603772 - Include e-data-server-ui-marshal.list in + tarballs + + Other Changes: + - Get the prototype for strptime() when it's available Instead + of only getting it on Linux. + - Also use nl_langinfo() + - In the factories, don't double-free some memory (and crash) + when the DBus service name owner changes. + - Fixes a crash in select - imapx. + - Sync up the store summary and rename labels for backward, + thunderbird compatibility - imapx + - Get rid of rest of the warnings. + - Initialize the uidset before sync user flags. + - Sync the changes - imapx. + - Lock the search. + - Create a new me-card in e_book_get_self() if one doesn't + exist + + Updated translations. + +------------------------------------------------------------------- +Wed Dec 23 11:04:39 CET 2009 - vuntz@opensuse.org + +- Change gnome-keyring-devel BuildRequires and Requires to + libgnome-keyring-devel, following the module split upstream. + ------------------------------------------------------------------- Tue Dec 1 20:20:09 CET 2009 - dimstar@opensuse.org diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 9820fb6..7897126 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -1,5 +1,5 @@ # -# spec file for package evolution-data-server (Version 2.29.3) +# spec file for package evolution-data-server (Version 2.29.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,14 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild +%define USE_EVOLDAP 0 Name: evolution-data-server %define _evo_version 2.30 BuildRequires: bison BuildRequires: db-devel -%if %suse_version > 1100 +%if %USE_EVOLDAP BuildRequires: evoldap2-devel %else BuildRequires: openldap2-devel @@ -30,20 +30,18 @@ BuildRequires: openldap2-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gnome-common -BuildRequires: gnome-keyring-devel BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: krb5-devel BuildRequires: libglade2-devel +BuildRequires: libgnome-keyring-devel BuildRequires: libgweather-devel >= 2.25.4 BuildRequires: libical-devel >= 0.43 BuildRequires: libidl-devel BuildRequires: libsoup-devel BuildRequires: mozilla-nss-devel BuildRequires: nss-shared-helper-devel -BuildRequires: perl-XML-Parser BuildRequires: python-devel -BuildRequires: sgml-skel BuildRequires: sqlite3-devel BuildRequires: translation-update-upstream License: GPLv2+ @@ -56,7 +54,7 @@ Obsoletes: evolution-data-server-64bit Obsoletes: evolution-data-server-32bit %endif Summary: Evolution Data Server -Version: 2.29.3 +Version: 2.29.4 Release: 1 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.25/%{name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE dice-eds-changes.patch pchenthill@novell.com -- Patch yet to be pushed upstream @@ -68,7 +66,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} Requires: libsoup >= 2.2.6 Requires: mozilla-nss -%if %suse_version > 1100 +%if %USE_EVOLDAP Requires: libevoldap-2_4-2 %endif Requires: libical0 >= 0.43 @@ -86,21 +84,20 @@ Group: Development/Libraries/GNOME Requires: evolution-data-server = %{?epoch:}%{version}-%{release} Requires: gconf2-devel Requires: glib2-devel -Requires: gnome-keyring-devel Requires: gnome-vfs2-devel Requires: gtk2-devel Requires: krb5-devel Requires: libcom_err Requires: libglade2-devel +Requires: libgnome-keyring-devel Requires: libgweather-devel >= 2.25.4 Requires: libgpg-error-devel Requires: libical-devel >= 0.43 Requires: libsoup-devel Requires: libxml2-devel Requires: nss-shared-helper-devel -Requires: orbit2-devel Requires: sqlite3-devel -%if %suse_version > 1100 +%if %USE_EVOLDAP Requires: evoldap2-devel %else Requires: openldap2-devel @@ -138,7 +135,7 @@ translation-update-upstream NOCONFIGURE=1 gnome-autogen.sh %{configure} \ --libexecdir=%{_libexecdir}/evolution-data-server \ -%if %suse_version > 1100 +%if %USE_EVOLDAP --with-openldap=%{_libdir}/evoldap \ %else --with-openldap=yes \ @@ -163,14 +160,20 @@ NOCONFIGURE=1 gnome-autogen.sh %if 0%{?suse_version} <= 1120 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif -# Remove the libtool archive files -%{__rm} $RPM_BUILD_ROOT/%{_libdir}/*.la -%{__rm} $RPM_BUILD_ROOT/%{_libdir}/*/*/*.la +find %{buildroot} -name '*.la' -type f -delete -print %find_lang evolution-data-server-%{_evo_version} -%fdupes $RPM_BUILD_ROOT +%if %USE_EVOLDAP + for file in %{buildroot}%{_libexecdir}/evolution-data-server/*; do + %{__mv} $file $file.bin + real_file=`echo $file | sed "s,%{buildroot},,g"` + echo -e "#!/bin/bash\n\nLD_LIBRARY_PATH=%{_libdir}/evoldap/lib exec -a \"$real_file\" $real_file.bin \"\$@\"" > $file + %{__chmod} +x $file + done +%endif +%fdupes %{buildroot} %clean -%{__rm} -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %post -p /sbin/ldconfig