diff --git a/evolution.changes b/evolution.changes index 2dcaebd..d6dd170 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 18 09:07:57 CET 2008 - sragavan@novell.com + +- Updates the tags for Patch upstreaming. + ------------------------------------------------------------------- Thu Jan 31 10:07:39 CST 2008 - maw@suse.de diff --git a/evolution.spec b/evolution.spec index f3df3f6..f8ccafa 100644 --- a/evolution.spec +++ b/evolution.spec @@ -10,6 +10,7 @@ # norootforbuild + Name: evolution BuildRequires: bison evolution-data-server-devel fdupes gnome-common gnome-doc-utils-devel gnome-icon-theme-devel gnome-pilot-devel gtk-doc gtkhtml2-devel intltool libidl libnotify libnotify-devel libpisock-devel libpisync-devel mozilla-nss-devel notification-daemon openldap2-devel perl-XML-Parser pilot-link psmisc python-devel scrollkeeper update-desktop-files License: GPL v2 or later @@ -21,7 +22,7 @@ AutoReqProv: on # BASE_VERSION (as defined in configure.in). %define evolution_base_version 2.22 Version: 2.21.90 -Release: 1 +Release: 10 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite #Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.10/%{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2 @@ -35,31 +36,49 @@ Source7: ximian-evolution-addressbook.png Source8: ximian-evolution-calendar.png Source9: ximian-evolution-tasks.png Patch1: evolution-2.0.1-de-po.patch +# PATCH-FIX-UPSTREAM nss-nspr.patch - Simiar patch is in upstream Patch15: nss-nspr.patch ### Patch16: evolution-configure.patch +# PATCH-FIX-UPSTREAM evolution-warnings.patch - Fixed in upstream for 2.21.91 Patch17: evolution-warnings.patch +# PATCH-FIX-UPSTREAM evolution-2.2.0-port-to-pilot-link-0.12.patch - Upstream has the patch already. Patch19: evolution-2.2.0-port-to-pilot-link-0.12.patch Patch20: evolution-desktop.patch #Patch23: publish-calendar-glade-fix.patch +# PATCH-FIX-UPSTREAM evolution-morewarnings.patch - Fixed in upstrream for 2.21.91 Patch24: evolution-morewarnings.patch Patch25: remove-nm-dep.patch +# PATCH-FIX-UPSTREAM bnc-156353-evo-crash-adding-apt.patch - Committed for 2.21.91 Patch30: bnc-156353-evo-crash-adding-apt.patch Patch31: calendar-sendbutton.patch +# PATCH-FIX-UPSTREAM bnc-153807-msg-composer-dont-raise.patch - Committed for 2.21.91 Patch45: bnc-153807-msg-composer-dont-raise.patch +# PATCH-FIX-UPSTREAM bnc-160049-change-gw-passwd-no-auth-prompt.patch - Committed for 2.21.91 Patch48: bnc-160049-change-gw-passwd-no-auth-prompt.patch +# PATCH-FIX-UPSTREAM bgo-325960-evo-foldersubscription.diff -- Committed for 2.21.91 Patch62: bgo-325960-evo-foldersubscription.diff Patch65: fix-exchange-menuitem.diff Patch66: fix-sendrecv.diff +# PATCH-FIX-UPSTREAM bnc-339266-evo-folder-size-offline.diff - Committed for 2.21.91 Patch69: bnc-339266-evo-folder-size-offline.diff +# PATCH-FIX-UPSTREAM bnc-167638.patch - committed for 2.21.91 Patch71: bnc-167638.patch +# PATCH-FIX-UPSTREAM bnc-173186.patch - committed for 2.21.91 Patch78: bnc-173186.patch +# PATCH-FIX-UPSTREAM bnc-178778-evo-open-appt-crash.diff - committed for 2.21.91 Patch88: bnc-178778-evo-open-appt-crash.diff +# PATCH-FIX-UPSTREAM bnc-214647-add-prefer-plain-plugin.patch - Fix already in upstream. Patch89: bnc-214647-add-prefer-plain-plugin.patch +# PATCH-FIX-UPSTREAM fix-security-gtkhtml-moreui.diff - Fix already in upstream Patch90: fix-security-gtkhtml-moreui.diff ### Patch91: evo-2.8.2-build-break.fix +# PATCH-FIX-UPSTREAM evo-2.8.2-regression-fix.patch -- Fix in 2.21.91 Patch92: evo-2.8.2-regression-fix.patch +# PATCH-FIX-UPSTREAM abuild.patch - Fixed for 2.21.91 Patch100: abuild.patch +# PATCH-FIX-UPSTREAM bnc-294999-subs-other-user-folder.patch - Fixed for 2.21.91 Patch104: bnc-294999-subs-other-user-folder.patch +# #PATCH-FIX-UPSTREAM build-fixes.diff - Fixed for 2.21.91 Patch999: build-fixes.diff Url: http://gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -167,7 +186,7 @@ Authors: %package devel Summary: Include Files and Libraries mandatory for Development. Group: Development/Libraries/C and C++ -Requires: evolution = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: evolution = %{?epoch:}%{version}-%{release} Requires: evolution-data-server-devel gtkhtml2-devel gail-devel libgnome-devel libgnomeui-devel libbonoboui-devel libnotify-devel libxml2-devel libopenssl-devel Provides: evolution2-devel Obsoletes: evolution2-devel @@ -181,7 +200,7 @@ to develop applications that require these. %package pilot Summary: The Integrated GNOME Mail, Calendar, and Addressbook Suite Group: Productivity/Networking/Email/Clients -Requires: evolution = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: evolution = %{?epoch:}%{version}-%{release} %description pilot Evolution consists of modular components (at the moment: mailer, @@ -415,6 +434,8 @@ fi %{_libdir}/evolution/*/conduits/*.so %changelog +* Mon Feb 18 2008 sragavan@novell.com +- Updates the tags for Patch upstreaming. * Thu Jan 31 2008 maw@suse.de - Update to version 2.21.90: + Improved spam filtering and new preferences UI for configuring @@ -497,7 +518,7 @@ fi bnc-308959-mail-attachment-icon.patch, evolution-stringcompare.patch, and bnc-302017-print-100pc.diff. -* Tue Dec 04 2007 maw@suse.de +* Wed Dec 05 2007 maw@suse.de - Build with openldap2-devel, not openldap2. * Tue Nov 13 2007 psankar@suse.de - bnc-308959-mail-attachment-icon.patch: Fixes mail attachment icon @@ -848,7 +869,7 @@ fi * Thu Mar 22 2007 maw@suse.de - Update to version 2.10.0 - Update the required intltool version. -* Mon Mar 12 2007 maw@suse.de +* Tue Mar 13 2007 maw@suse.de - Update to version 2.9.91 - Remove upstreamed bnc-214647-add-prefer-plain-plugin.patch - fix-security-gtkhtml-moreui.diff is now much smaller @@ -860,7 +881,7 @@ fi standard libraries, not modules. * Tue Jan 09 2007 sbrabec@suse.cz - More spec file cleanups. -* Wed Dec 13 2006 maw@suse.de +* Thu Dec 14 2006 maw@suse.de - Move to /usr - Some specfile cleanup. * Tue Nov 21 2006 vvaradhan@novell.com @@ -893,7 +914,7 @@ fi * Sat Oct 28 2006 kharish@suse.de - Add bnc-214647-add-prefer-plain-plugin.patch to include prefer-plain plugin in the build by default. -* Mon Oct 02 2006 jhargadon@suse.de +* Tue Oct 03 2006 jhargadon@suse.de - update to version 2.8.1 - translation updates - many bug fixes @@ -1014,7 +1035,7 @@ fi 325960 - Fix to show subscribed and public folders without restarting evolution (Sushma) - fix-exchange-menuitem.diff: Changed a menu item name in exchange plugin. (Srini) - fix-sendrecv.diff: Change 'Send Receive' button to 'Get Mail' (Srini) -* Wed Apr 19 2006 fejj@suse.de +* Thu Apr 20 2006 fejj@suse.de - Added bnc-159736-dbus-restart.patch to the build which replaces survive-dbus-restarts.patch (it solves the same problem plus more instances of the same) @@ -1050,7 +1071,7 @@ fi - Fixes (bnc) 160049 changed G/W password - no calendar prompt ... 158107 No notification of cancelled meetings -* Thu Mar 23 2006 vvaradhan@novell.com +* Fri Mar 24 2006 vvaradhan@novell.com - Fixes (bnc) 150427 evo 1.6 hang on calendar 153807 msg composer seems to lower instead of raise @@ -1242,18 +1263,18 @@ fi - Remove upstreamed patches and regenerated new ones - Remove NM-devel dependency from configure.in and make the code work with dbus interface itself. -* Fri Feb 17 2006 sreeves@suse.de +* Sat Feb 18 2006 sreeves@suse.de - Update .desktop file (Name, GenericName, Comment, DocPath) * Tue Feb 14 2006 aj@suse.de - Reduce BuildRequires. - Do not build with NetworkManager. -* Sun Feb 12 2006 ro@suse.de +* Mon Feb 13 2006 ro@suse.de - silence enough compiler warnings to make it build -* Sun Feb 12 2006 ro@suse.de +* Mon Feb 13 2006 ro@suse.de - fix compile flags "--fPIC" to "-fPIC" * Fri Feb 10 2006 vvaradhan@novell.com - Update to 2.5.90 -* Thu Jan 26 2006 mls@suse.de +* Fri Jan 27 2006 mls@suse.de - converted neededforbuild to BuildRequires * Wed Jan 25 2006 meissner@suse.de - fixed use of stack-protector in regards to older products/PLUS. @@ -1333,29 +1354,29 @@ fi - Fixed Send as iCalendar (#72795). * Tue Mar 15 2005 sbrabec@suse.cz - Fixed Czech translation. -* Thu Mar 10 2005 gekker@suse.de +* Fri Mar 11 2005 gekker@suse.de - Add Email to %%suse_update_desktop_file (65804). -* Tue Mar 08 2005 gekker@suse.de +* Wed Mar 09 2005 gekker@suse.de - Update to version 2.2.0 (GNOME 2.10). * Wed Mar 02 2005 gekker@suse.de - Update to version 2.1.6 -* Wed Feb 09 2005 gekker@suse.de +* Thu Feb 10 2005 gekker@suse.de - Update to version 2.1.5 * Sat Feb 05 2005 gekker@suse.de -Update to version 2.1.4 -* Thu Jan 20 2005 ro@suse.de +* Fri Jan 21 2005 ro@suse.de - fixed file list * Sat Jan 15 2005 clahey@suse.de - Updated to version 2.1.3. -* Mon Jan 10 2005 ro@suse.de +* Tue Jan 11 2005 ro@suse.de - added directories to filelist * Fri Jan 07 2005 gekker@suse.de - Update to version 2.1.2 * Tue Dec 07 2004 gekker@suse.de - update to version 2.0.3 (Ximian 70057) -* Mon Nov 29 2004 ro@suse.de +* Tue Nov 30 2004 ro@suse.de - adapted evolution-2.0.1-de-po.patch -* Mon Nov 29 2004 gekker@suse.de +* Tue Nov 30 2004 gekker@suse.de - Update version to 2.0.2 - Remove patches that are upstream - Change the no-groupwise-docs patch to actually apply @@ -1366,9 +1387,9 @@ fi * Thu Oct 07 2004 dobey@suse.de - Update default Inbox patch to not mention Groupwise support http://bugzilla.ximian.com/show_bugs.cgi?id=67643 -* Mon Oct 04 2004 dobey@suse.de +* Tue Oct 05 2004 dobey@suse.de - Add patch to fix bug 67513 in bugzilla.ximian.com -* Wed Sep 29 2004 dobey@suse.de +* Thu Sep 30 2004 dobey@suse.de - Add patch various bug fixes since 2.0.1 - Add patch to disable groupwise docs * Tue Sep 28 2004 dobey@suse.de @@ -1376,7 +1397,7 @@ fi * Mon Sep 27 2004 ke@suse.de - Fix German translation: keep the "DN" string for Distinguished Name [#44959]. -* Fri Sep 24 2004 dobey@suse.de +* Sat Sep 25 2004 dobey@suse.de - Update to version 2.0.1 - Add shared-mime-info to Prereq * Wed Sep 15 2004 dobey@suse.de @@ -1394,16 +1415,16 @@ fi - Cache evolution help files and show evolution in khelpcenter. * Wed Aug 18 2004 dobey@suse.de - Comment out %%debug_package -* Tue Aug 17 2004 dobey@suse.de +* Wed Aug 18 2004 dobey@suse.de - Add MozillaFirefox libdir to rpath -* Fri Aug 13 2004 dobey@suse.de +* Sat Aug 14 2004 dobey@suse.de - Update to version 1.5.93 - Split pilot conduits out into evolution-pilot package - Update dependencies for new versions - Remove 64-bit patches that are now in CVS - Remove patch for com_err.h checks as it is in CVS now - Add patch for default Inbox and Welcome message -* Mon Aug 09 2004 adrian@suse.de +* Tue Aug 10 2004 adrian@suse.de - move evolution menu entry out of the More menu. * Mon Aug 09 2004 dobey@suse.de - Update dependencies to pull in new versions @@ -1419,7 +1440,7 @@ fi - Add dependencies for spamassassin and other evo packages * Wed Jul 28 2004 dobey@suse.de - Updated to version 1.5.91 -* Thu Jul 15 2004 clahey@suse.de +* Fri Jul 16 2004 clahey@suse.de - Updated about box. * Tue Jul 13 2004 clahey@suse.de - Updated to version 1.5.90. @@ -1431,7 +1452,7 @@ fi - Fixed a non-void warning. * Wed Jun 09 2004 clahey@suse.de - Updated to version 1.5.9.1. Added SSL. Fixed warnings. -* Thu Jun 03 2004 mibarra@suse.de +* Fri Jun 04 2004 mibarra@suse.de - Uodated to version 1.5.9 * Thu May 27 2004 mibarra@suse.de - Enabled default binary at configure time, this means @@ -1439,7 +1460,7 @@ fi 'evolution-1.5'. * Tue May 25 2004 mibarra@suse.de - Fixed some 64bits compiler warnings. -* Fri May 21 2004 mibarra@suse.de +* Sat May 22 2004 mibarra@suse.de - Updated to 1.5.8. - Added gnome-icon-theme to # neededforbuild * Tue May 18 2004 clahey@suse.de @@ -1464,7 +1485,7 @@ fi - Fixed gconf schemas installation (#33114). * Mon Mar 08 2004 hhetter@suse.de - updated to version 1.4.6 -* Thu Feb 19 2004 ro@suse.de +* Fri Feb 20 2004 ro@suse.de - use -lpthread with libdb3 where needed * Fri Jan 09 2004 adrian@suse.de - remove unneeded %%run_ldconfig @@ -1492,9 +1513,9 @@ fi - updated to version 1.4.4 (GTK2/GNOME2 ported) * Mon Jul 14 2003 sbrabec@suse.cz - GNOME prefix change to /opt/gnome. -* Sun Jun 29 2003 ro@suse.de +* Mon Jun 30 2003 ro@suse.de - added directories to filelist -* Wed Jun 04 2003 ro@suse.de +* Thu Jun 05 2003 ro@suse.de - remove unpackaged files from buildroot * Mon Mar 24 2003 hhetter@suse.de - updated to security bugfix release 1.2.3 @@ -1522,11 +1543,11 @@ fi * Thu Aug 22 2002 hhetter@suse.de - build with rpath /opt/mozilla/%%_lib to correctly link wombat (Bug Id#18195) -* Fri Jul 26 2002 adrian@suse.de +* Sat Jul 27 2002 adrian@suse.de - fix neededforbuild * Tue Jul 16 2002 hhetter@suse.de - updated to bugfix release 1.0.8 -* Tue Jun 25 2002 ro@suse.de +* Wed Jun 26 2002 ro@suse.de - build libibex.a with -fPIC, it's linked into a shared library * Mon Jun 17 2002 jordi@suse.de - Updated to version 1.0.7 @@ -1535,7 +1556,7 @@ fi * Thu Jun 06 2002 hhetter@suse.de - more %%_lib fixes - use new mozilla's libdir -* Wed Jun 05 2002 ro@suse.de +* Thu Jun 06 2002 ro@suse.de - use libdir * Tue May 28 2002 hhetter@suse.de - use new mozilla-nss include paths @@ -1547,7 +1568,7 @@ fi - update to version 1.0.5 - build and link with db 3.1.17, required by evolution contacts -* Tue Apr 23 2002 ro@suse.de +* Wed Apr 24 2002 ro@suse.de - fix build with latest autoconf (AM_CONDITIONAL must appear in mainline) * Tue Mar 26 2002 hhetter@suse.de @@ -1556,7 +1577,7 @@ fi * Mon Feb 18 2002 hhetter@suse.de - updated to stable bugfix version 1.0.2 - build with automake 1.5 and current db -* Thu Jan 31 2002 ro@suse.de +* Fri Feb 01 2002 ro@suse.de - changed neededforbuild to * Wed Jan 30 2002 hhetter@suse.de - build with db 4.0.14 @@ -1568,7 +1589,7 @@ fi - libtoolize /libical too - build with db3 again - build with automake 1.5 -* Wed Nov 21 2001 ro@suse.de +* Thu Nov 22 2001 ro@suse.de - xml-i18n-toolize * Wed Nov 21 2001 ro@suse.de - changed neededforbuild to @@ -1611,7 +1632,7 @@ fi * Fri Mar 16 2001 egger@suse.de - Insert extra make to prevent propagation of BuildRoot dirs into the executable. -* Thu Mar 15 2001 egger@suse.de +* Fri Mar 16 2001 egger@suse.de - Updated to version 0.9. * Wed Mar 14 2001 ro@suse.de - added xf86 to neededforbuild @@ -1622,23 +1643,23 @@ fi - First version that works with SuSE, yay! * Thu Nov 09 2000 ro@suse.de - fixed neededforbuild again -* Wed Nov 08 2000 ro@suse.de +* Thu Nov 09 2000 ro@suse.de - typo fixed * Wed Nov 08 2000 ro@suse.de - fixed neededforbuild -* Tue Oct 31 2000 egger@suse.de +* Wed Nov 01 2000 egger@suse.de - Updated specfile to new long packagenames. - Reworked specfile. - Probably needs some more work; I'm taking care of that. -* Sun Oct 01 2000 egger@suse.de +* Mon Oct 02 2000 egger@suse.de - Fixed it a little more.... * Mon Sep 25 2000 egger@suse.de - Removed a thinko.... -* Sun Sep 24 2000 egger@suse.de +* Mon Sep 25 2000 egger@suse.de - Restructuring of the package. - Use the splitted packages oafdev and bonobod. - Buildproofed on i386. -* Thu Sep 21 2000 egger@suse.de +* Fri Sep 22 2000 egger@suse.de - Use BuildRoot. - Buildproofed on i386. * Tue Sep 19 2000 egger@suse.de