From e395dedac3ae2630398542acc50de9eb949b78d8c50b723a5a7a3eddd4c45c1e Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 13 May 2010 22:40:50 +0000 Subject: [PATCH] Accepting request 39931 from GNOME:Factory checked in (request 39931) OBS-URL: https://build.opensuse.org/request/show/39931 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=79 --- evolution-2.30.0.1.tar.bz2 | 3 ++ evolution-2.30.1.2.tar.bz2 | 3 -- evolution-as-needed.patch | 24 ++++++++++++++++ evolution.changes | 59 -------------------------------------- evolution.spec | 6 ++-- 5 files changed, 31 insertions(+), 64 deletions(-) create mode 100644 evolution-2.30.0.1.tar.bz2 delete mode 100644 evolution-2.30.1.2.tar.bz2 create mode 100644 evolution-as-needed.patch diff --git a/evolution-2.30.0.1.tar.bz2 b/evolution-2.30.0.1.tar.bz2 new file mode 100644 index 0000000..fda647c --- /dev/null +++ b/evolution-2.30.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e068356652d6bf1dbe2acc8e9eed5df9d283ea71de34d81b441d2bb2ac47009 +size 30346757 diff --git a/evolution-2.30.1.2.tar.bz2 b/evolution-2.30.1.2.tar.bz2 deleted file mode 100644 index 043dfc2..0000000 --- a/evolution-2.30.1.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b946914e53135edf89f9ddb8667d0ca3d76d37d8c622888befd65b2c4d3ce24 -size 30681129 diff --git a/evolution-as-needed.patch b/evolution-as-needed.patch new file mode 100644 index 0000000..d2c5095 --- /dev/null +++ b/evolution-as-needed.patch @@ -0,0 +1,24 @@ +Index: evolution-2.29.3.1/configure.ac +=================================================================== +--- evolution-2.29.3.1.orig/configure.ac ++++ evolution-2.29.3.1/configure.ac +@@ -722,8 +722,8 @@ if test "x$enable_pilot_conduits" = "xye + + CFLAGS_save="$CFLAGS" + CFLAGS="$CFLAGS $GNOME_PILOT_CFLAGS" +- LDFLAGS_save="$LDFLAGS" +- LDFLAGS="$GNOME_PILOT_LIBS $LDFLAGS" ++ LIBS_save="$LIBS" ++ LIBS="$LIBS $GNOME_PILOT_LIBS $LDFLAGS" + + AC_CACHE_CHECK([if pilot-link handles UTF-8 conversions],[ac_cv_pilot_link_utf8], + AC_RUN_IFELSE([AC_LANG_SOURCE( +@@ -743,7 +743,7 @@ if test "x$enable_pilot_conduits" = "xye + )],[ac_cv_pilot_link_utf8=yes],[ac_cv_pilot_link_utf8=no],[ac_cv_pilot_link_utf8=no])) + + CFLAGS="$CFLAGS_save" +- LDFLAGS="$LDFLAGS_save" ++ LIBS="$LIBS_save" + + if test "$ac_cv_pilot_link_utf8" = no; then + AC_MSG_ERROR([evolution requires pilot-link to have working UTF-8 conversion routines]) diff --git a/evolution.changes b/evolution.changes index 6b7c1e8..f9f00df 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,62 +1,3 @@ -------------------------------------------------------------------- -Thu Apr 29 10:22:24 IST 2010 - lakhil@novell.com - -- Update to version 2.30.1.2: - + Missing backslashes in data/icons/Makefile.am. - + bgo#374533 - Read window stays open after last email is deleted - + bgo#488979 - Disable Edit for card views in contacts - + bgo#569945 - Recurrence icon not removed after changing to - single event - + bgo#589393 - Configure fails to detect pilot-link utf8 - capabilities - + bgo#592117 - Calendar compressed weekend print improvement - + bgo#600861 - Backup utility should use --quit instead of - --force-shutdown - + bgo#608203 - Left pane of mailer window is really narrow at - startup - + bgo#610229 - Status bar progress goes beyond 100 percentage - + bgo#611646 - Calendar shows recurring birthdays incorrectly - + bgo#612236 - Find-As-You-Type in Folder list stops working - + bgo#612821 - Uses freed memory when changing task's source - + bgo#612916 - Runtime error on console when opening a message - window - + bgo#613261 - application/mbox not shown properly - + bgo#613352 - Changed time range not propagated to calendar - + bgo#613354 - Folder->Mark all messages as read does not work - + bgo#613356 - Calendar doesn't save Task/Memo table state - + bgo#613564 - If no <> in the email address, addr should be the - full email address. - + bgo#614325 - Shrink/expand To,Cc header images is missing - + bgo#614644 - Email window's title is blank when subject is blank - + bgo#614647 - Don't reset names and colors of default mail labels - + bgo#614813 - Crash during e-mail migration - + bgo#614889 - Memory leaks in EMailSidebar - + bgo#614892 - String leak in the composer - + bgo#614918 - GnomeGoal: Correct Desktop File - + bgo#614926 - Memos and Tasks accelerators switched since 2.28 - + bgo#615331 - Message list/Folder tree focus policy has changed - + bgo#616097 - Remembers page ranges - + Fix build settings under capplet. - + Fix build break due to GTK+ deprecations. - + Fix a potential crasher in e_contact_quick_add_email() - + Initialize dbus threading to avoid loosing alarms - + Work around another dropped gnome-icon-theme icon - + Fix migration event hook for google-account-setup and - calendar-weather plugins - + Fix disappearing e-table headers by realising the (horrible) - pet widget we are going to steal the gc from, so it actually - has it. - + Add more stock icons dropped from gnome-icon-theme. - + Revise legacy stock icon contexts. - + Use newer GTK+ API to manage print settings. - + Install stock icons in "hicolor" instead of "gnome". - + Remove duplicate use_system_timezone pref, set default to true - + Add missing linker flag to NetworkManager extension. - + Remove gtk_notebook_set_tab_label_packing(). - + Convert NetworkManager integration to an EShell extension. - + Updated translations -- Removed evolution-as-needed.patch - part of 2.30.1.2 tarball. - ------------------------------------------------------------------- Tue Mar 30 19:40:33 CEST 2010 - vuntz@opensuse.org diff --git a/evolution.spec b/evolution.spec index 95fb18f..3794600 100644 --- a/evolution.spec +++ b/evolution.spec @@ -60,7 +60,7 @@ License: LGPLv2.0 ; LGPLv3 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.30.1.2 +Version: 2.30.0.1 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 @@ -92,6 +92,8 @@ Patch53: bnc-440634-forwarded-hide-accept-decline.patch Patch54: bnc-445996-address-conflict.patch # PATCH-NEEDS-REBASE: sp-process-meetings.diff pchenthill@suse.de -- Fix for bug 449899 (bnc) (WAS: PATCH-FIX-SLED) Patch101: sp-process-meetings.diff +# PATCH-FIX-UPSTREAM evolution-as-needed.patch bgo#589393 dominique-obs@leuenberger.net -- Fix configure with --as-needed +Patch102: evolution-as-needed.patch Url: http://gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: bogofilter @@ -197,6 +199,7 @@ gnome-patch-translation-prepare #%patch54 # NEEDS-REBASE #%patch101 -p1 +%patch102 -p1 gnome-patch-translation-update %build @@ -281,7 +284,6 @@ fi %{_libdir}/evolution/*/modules/*-module-calendar.* %{_libdir}/evolution/*/modules/*-module-mail.* %{_libdir}/evolution/*/modules/*-module-plugin-lib.* -%{_libdir}/evolution/*/modules/*-module-network-manager.* %dir %{_libdir}/evolution/*/plugins %{_libdir}/evolution/*/plugins/*-addressbook-file.* %{_libdir}/evolution/*/plugins/*-backup-restore.*