Hello community, here is the log from the commit of package evolution for openSUSE:Factory checked in at Wed Dec 30 00:16:55 CET 2009. -------- --- GNOME/evolution/evolution.changes 2009-12-17 22:32:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/evolution/evolution.changes 2009-12-27 18:11:29.000000000 +0100 @@ -1,0 +2,88 @@ +Sun Dec 27 15:50:12 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. +- Call suse_update_desktop_file on evolution-alarm-notify. +- Add libgnomecanvas-devel Requires to devel package. +- Remove scrollkeeper BuildRequires. + +------------------------------------------------------------------- +Thu Dec 24 21:15:16 CET 2009 - vuntz@opensuse.org + +- Create python-plugins subpackage, and pass --enable-python to + configure to enable the python plugins. +- Add supplements on mono-plugins and python-plugins so that those + subpackages get automatically installed if evolution and mono or + python are installed. +- Fix Requires on evolution to not use the release version number. +- Add gconf2-devel, gtk2-devel Requires to devel package. +- Remove gail-devel, libgweather-devel, libnotify-devel, + libopenssl-devel Requires from devel package. + +------------------------------------------------------------------- +Thu Dec 24 18:43:18 CET 2009 - vuntz@opensuse.org + +- Update to version 2.29.4: + + Mailer: + - bgo#596967 - Per-folder setting for threading and preview + panel + - bgo#604884 - Use proper colors in Search bar when is search + activated + - bgo#593896 - "Search -> Find now" should not be always + enabled + - bgo#593700 - Restore folder's last selected message as + expected + - bgo#603184 - Various problems with search box in folders + - bgo#604761 - Select certificate doesn't work + - bgo#553057 - Show signer's information in a message + window/preview + - bgo#602505 - Incorrect information in message window + - bgo#551464 - Paste files into composer as attachments + + Calendar: + - bgo#596947 - Calendar view forgets memo pane height + - bgo#359755 - Do not fetch content of a CalDAV calendar when + given it + - bgo#604512 - Calendar publishing tab misses button label + - bgo#604182 - Do not block UI with publish-calendar messages + - bgo#359755 - Support for CalDAV collections + - bgo#603682 - Duplicate mnemonic in meeting window + - bgo#603061 - Use .ics for temp vcalendar files + + Contacts: + - bgo#602998 - Contacts searches are supposed to be per address + book + + Misc: + - bgo#604838 - Drop unused alert dialog + - bgo#604822 - Drop more alert titles. Drop all alert titles to + be found in *.error.xml. + - bgo#603701 - Don't treat 4 byte values as DDWORDs + - bgo#603342 - Memory leak fixes + - bgo#604562 - Typo in gconf schema + - bgo#604182 - Hide variable used only with HAVE_LIBNOTIFY + - bgo#499322 - Use extension for "Save as" suggested file name + - bgo#603972 - Proper title for dialog + - bgo#591938 - Update translator's comments + - bgo#604098 - Missing \n in EAlert + - bgo#603592 - X11 window roles should be set + - bgo#602963 - Migrate to new EError Apis + + Misc Fixes + - Punctuation fixes + - EShellContent cleanups. + - Fix distcheck errors. + - Fix a small memory leak in EShellBackend + - Add get_data_dir(), get_config_dir() vfuncs to EShellBackend + - Merge some composer header changes for Anjal. + - Introduce EMailBackend into libevolution-mail. + - Use the boxed CamelObject type for signal params in + MailFolderCache + - Remove mail-config, vfolder, and filter deps from + mail-folder-cache + - Kill ETableScrolled. + - Bump glib requirement to 2.22.0 + - Remove libhal requirement from configure + + Updated translations. +- Drop evolution-eds2.29.3.patch: not needed anymore. +- Update bnc-435668-hide-accept.patch to apply without fuzz. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- evolution-2.29.3.1.tar.bz2 evolution-eds2.29.3.patch New: ---- evolution-2.29.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution.spec ++++++ --- /var/tmp/diff_new_pack.V9MQbo/_old 2009-12-30 00:16:29.000000000 +0100 +++ /var/tmp/diff_new_pack.V9MQbo/_new 2009-12-30 00:16:29.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package evolution (Version 2.29.3.1) +# spec file for package evolution (Version 2.29.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,13 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild +%define USE_EVOLDAP 0 Name: evolution BuildRequires: NetworkManager-devel BuildRequires: bison -%if %suse_version > 1100 +%if %USE_EVOLDAP BuildRequires: evoldap2-devel %else BuildRequires: openldap2-devel @@ -52,7 +52,6 @@ BuildRequires: pilot-link BuildRequires: psmisc BuildRequires: python-devel -BuildRequires: scrollkeeper BuildRequires: shared-mime-info BuildRequires: sqlite3-devel BuildRequires: translation-update-upstream @@ -61,12 +60,10 @@ Group: Productivity/Networking/Email/Clients # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in. %define evolution_base_version 2.30 -Version: 2.29.3.1 +Version: 2.29.4 Release: 1 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.25/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM evolution-eds2.29.3.patch dimstar@opensuse.org -- e-d-s 2.29.3.1 was never released / tagged. -Patch0: evolution-eds2.29.3.patch # PATCH-NEEDS-REBASE calendar-sendbutton.patch -- It also needs a proper description and a bug number Patch7: calendar-sendbutton.patch # PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in %{_libdir}/evoldap/include @@ -113,14 +110,13 @@ License: LGPLv2.0 ; LGPLv3 Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ -Requires: evolution = %{?epoch:}%{version}-%{release} +Requires: evolution = %{version} Requires: evolution-data-server-devel -Requires: gail-devel +Requires: gconf2-devel Requires: gnome-desktop-devel +Requires: gtk2-devel Requires: gtkhtml2-devel -Requires: libgweather-devel >= 2.25.4 -Requires: libnotify-devel -Requires: libopenssl-devel +Requires: libgnomecanvas-devel Requires: libunique-devel Requires: libxml2-devel Provides: evolution2-devel = %{version} @@ -134,7 +130,7 @@ License: GFDLv1.1 ; GPLv2+ ; LGPLv2.1+ ; MIT License (or similar) Summary: The Integrated GNOME Mail, Calendar, and Addressbook Suite Group: Productivity/Networking/Email/Clients -Requires: evolution = %{?epoch:}%{version}-%{release} +Requires: evolution = %{version} %description pilot Evolution consists of modular components (at the moment: mailer, @@ -146,7 +142,8 @@ License: LGPLv2.0 ; LGPLv3 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Group: Productivity/Networking/Email/Clients -Requires: evolution = %{?epoch:}%{version}-%{release} +Requires: evolution = %{version} +Supplements: packageand(evolution:mono-core) # Dice support is disabled #BuildRequires: dice-devel BuildRequires: evolution-sharp @@ -163,14 +160,28 @@ of the modular design, it is possible to plug new components into Evolution or embed the existing ones in other applications. +%package python-plugins +License: LGPLv2.0 ; LGPLv3 +Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite +Group: Productivity/Networking/Email/Clients +Requires: evolution = %{version} +Supplements: packageand(evolution:python) + +%description python-plugins +Evolution consists of modular components (at the moment: mailer, +calendar, and address book) that should make daily life easier. Because +of the modular design, it is possible to plug new components into +Evolution or embed the existing ones in other applications. + %lang_package %prep %setup -q translation-update-upstream #gnome-patch-translation-prepare -%patch0 -p1 # %patch7 +%if %USE_EVOLDAP %patch15 -p1 +%endif %patch16 -p1 %patch18 %patch19 @@ -196,7 +207,7 @@ %{__sed} -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in %{configure} \ --disable-scrollkeeper \ -%if %suse_version > 1100 +%if %USE_EVOLDAP --with-openldap=%{_libdir}/evoldap \ %else --with-openldap=yes \ @@ -210,6 +221,7 @@ --enable-exchange=yes \ --enable-default-binary=yes \ --enable-mono=yes \ + --enable-python=yes \ --enable-icedesktop=no \ --disable-static # Processing the files in help uses _lots_ of memory, so running that part in parallel is bad. @@ -223,24 +235,22 @@ %if 0%{?suse_version} <= 1120 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif -# Remove the libtool archive files -%{__rm} $RPM_BUILD_ROOT/%{_libdir}/evolution/*/*.la -%{__rm} $RPM_BUILD_ROOT/%{_libdir}/evolution/*/*/*.la +find %{buildroot} -name '*.la' -type f -delete -print %suse_update_desktop_file -G "Mail and Calendar" -N "Evolution" -D "evolution" evolution Core-Office +%suse_update_desktop_file evolution-alarm-notify %find_lang evolution-%evolution_base_version %find_lang evolution evolution-%evolution_base_version.lang %find_gconf_schemas -%{__cat} %{name}.schemas_list >%{name}.lst -%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/mime-info -%fdupes $RPM_BUILD_ROOT -%if %suse_version > 1100 -%{__mv} $RPM_BUILD_ROOT/%{_bindir}/evolution $RPM_BUILD_ROOT/%{_bindir}/evolution.bin -echo -e "#!/bin/bash\n\nLD_LIBRARY_PATH=%{_libdir}/evoldap/lib exec -a \"%{_bindir}/evolution\" %{_bindir}/evolution.bin \"\$@\"" > $RPM_BUILD_ROOT/%{_bindir}/evolution -%{__chmod} +x $RPM_BUILD_ROOT/%{_bindir}/evolution +%{__rm} -r %{buildroot}%{_datadir}/mime-info +%if %USE_EVOLDAP + %{__mv} %{buildroot}%{_bindir}/evolution %{buildroot}%{_bindir}/evolution.bin + echo -e "#!/bin/bash\n\nLD_LIBRARY_PATH=%{_libdir}/evoldap/lib exec -a \"%{_bindir}/evolution\" %{_bindir}/evolution.bin \"\$@\"" > %{buildroot}%{_bindir}/evolution + %{__chmod} +x %{buildroot}%{_bindir}/evolution %endif +%fdupes %{buildroot} %clean -%{__rm} -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %pre -f %{name}.schemas_pre @@ -258,7 +268,7 @@ usr/bin/update-mime-database usr/share/mime >/dev/null fi -%files -f %{name}.lst +%files -f %{name}.schemas_list %defattr(-,root,root) %doc AUTHORS COPYING COPYING.LGPL2 COPYING.LGPL3 COPYING-DOCS COPYING.OPENLDAP ChangeLog MAINTAINERS NEWS NEWS-1.0 README %{_bindir}/* @@ -337,4 +347,8 @@ #%{_libdir}/evolution/*/plugins/*-sharepoint-* #%{_libdir}/evolution/*/plugins/*.dll +%files python-plugins +%defattr(-,root,root) +%{_libdir}/evolution/*/modules/*-module-plugin-python.* + %changelog ++++++ bnc-435668-hide-accept.patch ++++++ --- /var/tmp/diff_new_pack.V9MQbo/_old 2009-12-30 00:16:30.000000000 +0100 +++ /var/tmp/diff_new_pack.V9MQbo/_new 2009-12-30 00:16:30.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- plugins/itip-formatter/itip-formatter.c.orig +++ plugins/itip-formatter/itip-formatter.c -@@ -2112,6 +2112,14 @@ in_proper_folder (CamelFolder *folder) +@@ -2115,6 +2115,14 @@ in_proper_folder (CamelFolder *folder) if (!folder) return res; @@ -16,4 +16,4 @@ + uri = mail_tools_folder_to_url (folder); - if (mail_folder_cache_get_folder_info_flags (folder, &flags)) { + if (mail_folder_cache_get_folder_info_flags (mail_folder_cache_get_default (), ++++++ evolution-2.29.3.1.tar.bz2 -> evolution-2.29.4.tar.bz2 ++++++ GNOME/evolution/evolution-2.29.3.1.tar.bz2 /mounts/work_src_done/STABLE/evolution/evolution-2.29.4.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org