Hello community, here is the log from the commit of package evolution checked in at Wed Oct 22 17:49:18 CEST 2008. -------- --- GNOME/evolution/evolution.changes 2008-10-03 10:56:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/evolution/evolution.changes 2008-10-16 19:39:29.000000000 +0200 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Thu Oct 16 12:34:00 CDT 2008 - maw@novell.com + +- Add evolution-custom-openldap-includes.patch +- Drop build-fixes.diff. + calling whatdependson for head-i586 Old: ---- build-fixes.diff New: ---- evolution-custom-openldap-includes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution.spec ++++++ --- /var/tmp/diff_new_pack.c23964/_old 2008-10-22 17:49:01.000000000 +0200 +++ /var/tmp/diff_new_pack.c23964/_new 2008-10-22 17:49:01.000000000 +0200 @@ -20,6 +20,7 @@ Name: evolution BuildRequires: bison +BuildRequires: evoldap2-devel BuildRequires: evolution-data-server-devel BuildRequires: fdupes BuildRequires: gnome-common @@ -36,7 +37,6 @@ BuildRequires: libpisync-devel BuildRequires: mozilla-nss-devel BuildRequires: notification-daemon -BuildRequires: evoldap2-devel BuildRequires: perl-XML-Parser BuildRequires: pilot-link BuildRequires: psmisc @@ -52,7 +52,7 @@ # BASE_VERSION as defined in configure.in. %define evolution_base_version 2.24 Version: 2.24.0 -Release: 2 +Release: 3 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Source0: %{name}-%{version}.tar.bz2 Source1: summerdance-about2.png @@ -75,17 +75,17 @@ Patch7: calendar-sendbutton.patch Patch8: fix-exchange-menuitem.diff Patch9: fix-sendrecv.diff -# PATCH-FIX-UPSTREAM build-fixes.diff - Fixed for 2.21.91 -Patch10: build-fixes.diff Patch13: pst-import.patch # PATCH-FIX-UPSTREAM evolution-advanced-search.patch bgo554456 sbrabec@suse.cz -- Fix broken advanced search GUI. Patch14: evolution-advanced-search.patch +# PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in /usr/lib/evoldap/include +Patch15: evolution-custom-openldap-includes.patch Url: http://gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: yelp Recommends: bogofilter Requires: gtkhtml2 >= 3.10.0 -Requires: evolution-data-server >= 1.6.0 +Requires: evolution-data-server >= 2.24.0 Requires: gnome-icon-theme >= 2.10.0 Requires: %{name}-lang = %{version} %gconf_schemas_prereq @@ -311,9 +311,9 @@ # %patch7 %patch8 %patch9 -#%patch10 %patch13 %patch14 -p1 +%patch15 -p1 %build autoreconf -f -i @@ -325,16 +325,16 @@ export CFLAGS="$CFLAGS -fstack-protector" %endif sed -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in -%configure\ - --libexecdir=%{_prefix}/lib\ - --disable-scrollkeeper\ - --with-openldap=/usr/lib/evoldap\ - --with-pisock\ - --enable-pilot-conduits=yes\ - --with-krb5=/usr\ - --with-static-ldap=no\ - --enable-nss=yes\ - --enable-ipv6=yes\ +%configure \ + --libexecdir=%{_prefix}/lib \ + --disable-scrollkeeper \ + --with-openldap=/usr/lib/evoldap \ + --with-pisock \ + --enable-pilot-conduits=yes \ + --with-krb5=/usr \ + --with-static-ldap=no \ + --enable-nss=yes \ + --enable-ipv6=yes \ --enable-default-binary=yes # Processing the files in help uses _lots_ of memory, so running that part # in parallel is bad. @@ -425,6 +425,9 @@ %{_libdir}/evolution/*/conduits/*.so %changelog +* Thu Oct 16 2008 maw@novell.com +- Add evolution-custom-openldap-includes.patch +- Drop build-fixes.diff. * Fri Oct 03 2008 sragavan@suse.de - Make sure that Evolution/friends depend on evoldap2-client * Wed Oct 01 2008 sbrabec@suse.cz @@ -437,14 +440,14 @@ bgo#539536, bgo#551548, bgo#551628, bgo#551895, bgo#551915, and bgo#552911 + Updated translations. -* Wed Sep 17 2008 maw@suse.de +* Tue Sep 16 2008 maw@suse.de - Updated the source tarball to svn r36353. - Update to svn r36353. * Mon Sep 08 2008 maw@suse.de - Update to version 2.23.92: + Bug fixed: bgo#549968 + Updated translations. -* Wed Sep 03 2008 maw@suse.de +* Tue Sep 02 2008 maw@suse.de - Update to version 2.23.91: + Bugs fixed: bgo#458512, bgo#509647, bgo#523327, bgo#525555, bgo#534762, bgo#544430, bgo#546926, bgo#547822, bgo#547822, @@ -492,7 +495,7 @@ bgo#544994, bgo#545300, bgo#545303, bgo#545436, bgo#545558, bgo#545568, bgo#545820, and bgo#546057 + Updated translations. -* Sat Jun 21 2008 maw@suse.de +* Fri Jun 20 2008 maw@suse.de - Update to version 2.23.4: + Quota support to IMAP/POP accounts + Configurable Proxy settings for Evolution @@ -551,7 +554,7 @@ bug-394641_evo-CVE-2008-1109.diff - bnc#395708 - bgo-395708_prefer-plain.patch - Outlook meeting invites look as text messages - bnc#394441 - bnc-394441-exchange-addbook-crash.diff - Addressbook crash -* Wed May 21 2008 msuman@suse.de +* Tue May 20 2008 msuman@suse.de - Added + bgo-534012-backup-permission.patch (Sankar P) + bgo-533820-fix-crash-on-border-clicking-meetings.diff (Chenthill P) (bnc#391993) @@ -609,7 +612,7 @@ * Wed Apr 09 2008 msuman@suse.de - Configurable proxy settings for Evolution (Varadhan) + Added patch: bnc-188523-evo-fix-authenticated-proxy-support.diff (bnc#188523) -* Fri Mar 14 2008 maw@suse.de +* Thu Mar 13 2008 maw@suse.de - Update to version 2.22.0: + Bigs fixed: bnc#282466, bgo#351672m and bgo#520745 + Updated translations. @@ -725,7 +728,7 @@ bnc-308959-mail-attachment-icon.patch, evolution-stringcompare.patch, and bnc-302017-print-100pc.diff. -* Wed Dec 05 2007 maw@suse.de +* Tue Dec 04 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 @@ -788,7 +791,7 @@ * Tue Aug 21 2007 sbrabec@suse.cz - Fixed crash on appointments with no no SENTBY parameter (#301835, patch from Suman Manjunath). -* Sat Aug 18 2007 jberkman@novell.com +* Fri Aug 17 2007 jberkman@novell.com - fix infinite recursion when used with smartcard auth patches * Mon Aug 06 2007 maw@suse.de - Split off a -lang subpackage. @@ -1076,7 +1079,7 @@ * Thu Mar 22 2007 maw@suse.de - Update to version 2.10.0 - Update the required intltool version. -* Tue Mar 13 2007 maw@suse.de +* Mon Mar 12 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 @@ -1088,7 +1091,7 @@ standard libraries, not modules. * Tue Jan 09 2007 sbrabec@suse.cz - More spec file cleanups. -* Thu Dec 14 2006 maw@suse.de +* Wed Dec 13 2006 maw@suse.de - Move to /usr - Some specfile cleanup. * Tue Nov 21 2006 vvaradhan@novell.com @@ -1121,7 +1124,7 @@ * 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. -* Tue Oct 03 2006 jhargadon@suse.de +* Mon Oct 02 2006 jhargadon@suse.de - update to version 2.8.1 - translation updates - many bug fixes @@ -1216,14 +1219,14 @@ 168697 - Fixes a alarm crash (Srini) 171592 - Fixes a alarm crash (Srini) 170076 - Fixes a wrong mime lookup for a attachment (Srini) -* Wed May 03 2006 fejj@suse.de +* Tue May 02 2006 fejj@suse.de - Added bnc-167638.patch: Fixes the long Evolution quit times when the user tries to close Evolution when it is in the middle of syncing stuff to an IMAP/GW server. * Tue May 02 2006 pchenthill@novell.com - Update the patch bnc-158107-no-notification-canceled-mtgs.patch Fixes https://bugzilla.novell.com/show_bug.cgi?id=171531 -* Thu Apr 27 2006 dobey@suse.de +* Wed Apr 26 2006 dobey@suse.de - Update trach icon patch to deal with more instances Fixes https://bugzilla.novell.com/show_bug.cgi?id=160837 * Mon Apr 24 2006 sragavan@novell.com @@ -1242,7 +1245,7 @@ 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) -* Thu Apr 20 2006 fejj@suse.de +* Wed Apr 19 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) @@ -1278,7 +1281,7 @@ - Fixes (bnc) 160049 changed G/W password - no calendar prompt ... 158107 No notification of cancelled meetings -* Fri Mar 24 2006 vvaradhan@novell.com +* Thu Mar 23 2006 vvaradhan@novell.com - Fixes (bnc) 150427 evo 1.6 hang on calendar 153807 msg composer seems to lower instead of raise @@ -1470,18 +1473,18 @@ - Remove upstreamed patches and regenerated new ones - Remove NM-devel dependency from configure.in and make the code work with dbus interface itself. -* Sat Feb 18 2006 sreeves@suse.de +* Fri Feb 17 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. -* Mon Feb 13 2006 ro@suse.de +* Sun Feb 12 2006 ro@suse.de - silence enough compiler warnings to make it build -* Mon Feb 13 2006 ro@suse.de +* Sun Feb 12 2006 ro@suse.de - fix compile flags "--fPIC" to "-fPIC" * Fri Feb 10 2006 vvaradhan@novell.com - Update to 2.5.90 -* Fri Jan 27 2006 mls@suse.de +* Thu Jan 26 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. @@ -1561,29 +1564,29 @@ - Fixed Send as iCalendar (#72795). * Tue Mar 15 2005 sbrabec@suse.cz - Fixed Czech translation. -* Fri Mar 11 2005 gekker@suse.de +* Thu Mar 10 2005 gekker@suse.de - Add Email to %%suse_update_desktop_file (65804). -* Wed Mar 09 2005 gekker@suse.de +* Tue Mar 08 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 -* Thu Feb 10 2005 gekker@suse.de +* Wed Feb 09 2005 gekker@suse.de - Update to version 2.1.5 * Sat Feb 05 2005 gekker@suse.de -Update to version 2.1.4 -* Fri Jan 21 2005 ro@suse.de +* Thu Jan 20 2005 ro@suse.de - fixed file list * Sat Jan 15 2005 clahey@suse.de - Updated to version 2.1.3. -* Tue Jan 11 2005 ro@suse.de +* Mon Jan 10 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) -* Tue Nov 30 2004 ro@suse.de +* Mon Nov 29 2004 ro@suse.de - adapted evolution-2.0.1-de-po.patch -* Tue Nov 30 2004 gekker@suse.de +* Mon Nov 29 2004 gekker@suse.de - Update version to 2.0.2 - Remove patches that are upstream - Change the no-groupwise-docs patch to actually apply @@ -1594,9 +1597,9 @@ * 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 -* Tue Oct 05 2004 dobey@suse.de +* Mon Oct 04 2004 dobey@suse.de - Add patch to fix bug 67513 in bugzilla.ximian.com -* Thu Sep 30 2004 dobey@suse.de +* Wed Sep 29 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 @@ -1604,7 +1607,7 @@ * Mon Sep 27 2004 ke@suse.de - Fix German translation: keep the "DN" string for Distinguished Name [#44959]. -* Sat Sep 25 2004 dobey@suse.de +* Fri Sep 24 2004 dobey@suse.de - Update to version 2.0.1 - Add shared-mime-info to Prereq * Wed Sep 15 2004 dobey@suse.de @@ -1622,16 +1625,16 @@ - Cache evolution help files and show evolution in khelpcenter. * Wed Aug 18 2004 dobey@suse.de - Comment out %%debug_package -* Wed Aug 18 2004 dobey@suse.de +* Tue Aug 17 2004 dobey@suse.de - Add MozillaFirefox libdir to rpath -* Sat Aug 14 2004 dobey@suse.de +* Fri Aug 13 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 -* Tue Aug 10 2004 adrian@suse.de +* Mon Aug 09 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 @@ -1645,29 +1648,29 @@ - Updated to version 1.5.92.1 - Add patch for more 64bit cleanliness issues - Add dependencies for spamassassin and other evo packages -* Thu Jul 29 2004 dobey@suse.de +* Wed Jul 28 2004 dobey@suse.de - Updated to version 1.5.91 -* Fri Jul 16 2004 clahey@suse.de +* Thu Jul 15 2004 clahey@suse.de - Updated about box. -* Wed Jul 14 2004 clahey@suse.de +* Tue Jul 13 2004 clahey@suse.de - Updated to version 1.5.90. * Mon Jun 21 2004 clahey@suse.de - Updated to version 1.5.9.2. Added spamassassin. -* Sat Jun 12 2004 clahey@suse.de +* Fri Jun 11 2004 clahey@suse.de - Added rpath stuff for mozilla. * Thu Jun 10 2004 clahey@suse.de - Fixed a non-void warning. * Wed Jun 09 2004 clahey@suse.de - Updated to version 1.5.9.1. Added SSL. Fixed warnings. -* Fri Jun 04 2004 mibarra@suse.de +* Thu Jun 03 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 evolution binary will be named 'evolution' instead of 'evolution-1.5'. -* Wed May 26 2004 mibarra@suse.de +* Tue May 25 2004 mibarra@suse.de - Fixed some 64bits compiler warnings. -* Sat May 22 2004 mibarra@suse.de +* Fri May 21 2004 mibarra@suse.de - Updated to 1.5.8. - Added gnome-icon-theme to # neededforbuild * Tue May 18 2004 clahey@suse.de @@ -1692,7 +1695,7 @@ - Fixed gconf schemas installation (#33114). * Mon Mar 08 2004 hhetter@suse.de - updated to version 1.4.6 -* Fri Feb 20 2004 ro@suse.de +* Thu Feb 19 2004 ro@suse.de - use -lpthread with libdb3 where needed * Fri Jan 09 2004 adrian@suse.de - remove unneeded %%run_ldconfig @@ -1705,7 +1708,7 @@ - Fix use of build root. * Mon Sep 22 2003 sbrabec@suse.cz - Obsolete bonobo-conf. -* Mon Sep 15 2003 adrian@suse.de +* Sun Sep 14 2003 adrian@suse.de - Add Email Category * Tue Sep 09 2003 sbrabec@suse.cz - Fixed default charset bug (bug #29851, Ximian bug #47638). @@ -1720,9 +1723,9 @@ - updated to version 1.4.4 (GTK2/GNOME2 ported) * Mon Jul 14 2003 sbrabec@suse.cz - GNOME prefix change to /opt/gnome. -* Mon Jun 30 2003 ro@suse.de +* Sun Jun 29 2003 ro@suse.de - added directories to filelist -* Thu Jun 05 2003 ro@suse.de +* Wed Jun 04 2003 ro@suse.de - remove unpackaged files from buildroot * Mon Mar 24 2003 hhetter@suse.de - updated to security bugfix release 1.2.3 @@ -1750,11 +1753,11 @@ * Thu Aug 22 2002 hhetter@suse.de - build with rpath /opt/mozilla/%%_lib to correctly link wombat (Bug Id#18195) -* Sat Jul 27 2002 adrian@suse.de +* Fri Jul 26 2002 adrian@suse.de - fix neededforbuild * Tue Jul 16 2002 hhetter@suse.de - updated to bugfix release 1.0.8 -* Wed Jun 26 2002 ro@suse.de +* Tue Jun 25 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 @@ -1763,7 +1766,7 @@ * Thu Jun 06 2002 hhetter@suse.de - more %%_lib fixes - use new mozilla's libdir -* Thu Jun 06 2002 ro@suse.de +* Wed Jun 05 2002 ro@suse.de - use libdir * Tue May 28 2002 hhetter@suse.de - use new mozilla-nss include paths @@ -1775,7 +1778,7 @@ - update to version 1.0.5 - build and link with db 3.1.17, required by evolution contacts -* Wed Apr 24 2002 ro@suse.de +* Tue Apr 23 2002 ro@suse.de - fix build with latest autoconf (AM_CONDITIONAL must appear in mainline) * Tue Mar 26 2002 hhetter@suse.de @@ -1784,7 +1787,7 @@ * Mon Feb 18 2002 hhetter@suse.de - updated to stable bugfix version 1.0.2 - build with automake 1.5 and current db -* Fri Feb 01 2002 ro@suse.de +* Thu Jan 31 2002 ro@suse.de - changed neededforbuild <libpng> to <libpng-devel-packages> * Wed Jan 30 2002 hhetter@suse.de - build with db 4.0.14 @@ -1796,7 +1799,7 @@ - libtoolize /libical too - build with db3 again - build with automake 1.5 -* Thu Nov 22 2001 ro@suse.de +* Wed Nov 21 2001 ro@suse.de - xml-i18n-toolize * Wed Nov 21 2001 ro@suse.de - changed neededforbuild <xml-i18n-tools> to <intltool> @@ -1839,7 +1842,7 @@ * Fri Mar 16 2001 egger@suse.de - Insert extra make to prevent propagation of BuildRoot dirs into the executable. -* Fri Mar 16 2001 egger@suse.de +* Thu Mar 15 2001 egger@suse.de - Updated to version 0.9. * Wed Mar 14 2001 ro@suse.de - added xf86 to neededforbuild @@ -1850,26 +1853,26 @@ - First version that works with SuSE, yay! * Thu Nov 09 2000 ro@suse.de - fixed neededforbuild again -* Thu Nov 09 2000 ro@suse.de +* Wed Nov 08 2000 ro@suse.de - typo fixed * Wed Nov 08 2000 ro@suse.de - fixed neededforbuild -* Wed Nov 01 2000 egger@suse.de +* Tue Oct 31 2000 egger@suse.de - Updated specfile to new long packagenames. - Reworked specfile. - Probably needs some more work; I'm taking care of that. -* Mon Oct 02 2000 egger@suse.de +* Sun Oct 01 2000 egger@suse.de - Fixed it a little more.... * Mon Sep 25 2000 egger@suse.de - Removed a thinko.... -* Mon Sep 25 2000 egger@suse.de +* Sun Sep 24 2000 egger@suse.de - Restructuring of the package. - Use the splitted packages oafdev and bonobod. - Buildproofed on i386. -* Fri Sep 22 2000 egger@suse.de +* Thu Sep 21 2000 egger@suse.de - Use BuildRoot. - Buildproofed on i386. -* Wed Sep 20 2000 egger@suse.de +* Tue Sep 19 2000 egger@suse.de - First compilable version of it using version 0.5.1 - Buildproofed on i386. * Fri Sep 01 2000 egger@suse.de ++++++ evolution-custom-openldap-includes.patch ++++++ diff --git a/configure.in b/configure.in index c1bd707..0f03233 100644 --- a/configure.in +++ b/configure.in @@ -537,7 +537,7 @@ esac SAVE_CFLAGS="$CFLAGS" SAVE_LIBS="$LIBS" -LDAP_CFLAGS="-DLDAP_DEPRECATED" +LDAP_CFLAGS="-DLDAP_DEPRECATED -I$with_openldap/include" CFLAGS="$CFLAGS $LDAP_CFLAGS" LIBS="$LIBS $LDAP_LIBS" AC_CHECK_FUNCS(ldap_ntlm_bind) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org