From e821a266d003f3eaf845d0648a74a6d033bd77d1a077b2d86a6ed6e9a496cdec Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 4 Sep 2009 23:43:29 +0000 Subject: [PATCH] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=38 --- evolution-data-server-2.27.90.tar.bz2 | 3 ++ evolution-data-server-2.27.91.tar.bz2 | 3 -- evolution-data-server-krb5-as-needed.patch | 36 ++++++++++++++++++++++ evolution-data-server.changes | 22 ------------- evolution-data-server.spec | 15 +++++++-- 5 files changed, 51 insertions(+), 28 deletions(-) create mode 100644 evolution-data-server-2.27.90.tar.bz2 delete mode 100644 evolution-data-server-2.27.91.tar.bz2 create mode 100644 evolution-data-server-krb5-as-needed.patch diff --git a/evolution-data-server-2.27.90.tar.bz2 b/evolution-data-server-2.27.90.tar.bz2 new file mode 100644 index 0000000..e05bdff --- /dev/null +++ b/evolution-data-server-2.27.90.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2dba65237515e57f8004433107528e3534b4a3ea73aaa8f00f9fba41a7c87f4 +size 14344213 diff --git a/evolution-data-server-2.27.91.tar.bz2 b/evolution-data-server-2.27.91.tar.bz2 deleted file mode 100644 index d3c16bf..0000000 --- a/evolution-data-server-2.27.91.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e337ef3db3bc0bdd45adb19eb6a0879d0366c56745f9ce71eacd653617c17e00 -size 22219382 diff --git a/evolution-data-server-krb5-as-needed.patch b/evolution-data-server-krb5-as-needed.patch new file mode 100644 index 0000000..4791c96 --- /dev/null +++ b/evolution-data-server-krb5-as-needed.patch @@ -0,0 +1,36 @@ +diff -ur evolution-data-server-2.27.90.orig/configure.ac evolution-data-server-2.27.90/configure.ac +--- evolution-data-server-2.27.90.orig/configure.ac 2009-08-09 16:28:54.000000000 +0200 ++++ evolution-data-server-2.27.90/configure.ac 2009-08-10 22:59:25.000000000 +0200 +@@ -1168,27 +1168,27 @@ + + msg_krb5="no" + if test "x${with_krb5}" != "xno"; then +- LDFLAGS_save="$LDFLAGS" ++ LIBS_save="$LIBS" + + mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" + heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi" + sunlibs="-lkrb5 -lgss" + AC_CACHE_CHECK([for Kerberos 5], [ac_cv_lib_kerberos5], + [ +- LDFLAGS="$LDFLAGS -L$with_krb5_libs $mitlibs" ++ LIBS="$LIBS -L$with_krb5_libs $mitlibs" + AC_LINK_IFELSE([AC_LANG_CALL([], [krb5_init_context])], + [ac_cv_lib_kerberos5="$mitlibs"], + [ +- LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $heimlibs" ++ LIBS="$LIBS_save -L$with_krb5_libs $heimlibs" + AC_LINK_IFELSE([AC_LANG_CALL([], [krb5_init_context])], + [ac_cv_lib_kerberos5="$heimlibs"], + [ +- LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $sunlibs" ++ LIBS="$LIBS_save -L$with_krb5_libs $sunlibs" + AC_LINK_IFELSE([AC_LANG_CALL([], [krb5_init_context])], + [ac_cv_lib_kerberos5="$sunlibs"], [ac_cv_lib_kerberos5="no"]) + ]) + ]) +- LDFLAGS="$LDFLAGS_save" ++ LIBS="$LIBS_save" + ]) + if test "$ac_cv_lib_kerberos5" != "no"; then + AC_DEFINE(HAVE_KRB5,1,[Define if you have Krb5]) diff --git a/evolution-data-server.changes b/evolution-data-server.changes index aa940a3..eaa8a6d 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,25 +1,3 @@ -------------------------------------------------------------------- -Mon Aug 24 12:04:07 CEST 2009 - dimstar@opensuse.org - -- Update to version 2.27.91: - + Mailer: - - bgo#350007 - evolution busy-waits on GPG signing operations - - bgo#571206 - Index files on Maildir accounts are not updated - on move - - bgo#590044 - Drop index on all columns of sqlite database - - bgo#592310 - Deadlock in maildir provider after doing expunge - + Miscellaneous: - - bgo#591324 - Cosmetic changes and fixes in configure.ac - - bgo#591326 - Keep m4 macros in their own folder - - bgo#591377 - Fails to detect krb5 in configure with - -as-needed - + Other fixes: - - Updated the macros from latest gtk-doc.m4 - + Updated translations -- Drop evolution-data-server-krb5-as-needed.patch, upstreamed. -- Use gnome-autogen.sh to reconfigure instead of intltool, automake - and autoconf. - ------------------------------------------------------------------- Mon Aug 10 22:37:35 CEST 2009 - dominique-obs@leuenberger.net diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 2317fd1..9588b9c 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -1,5 +1,5 @@ # -# spec file for package evolution-data-server (Version 2.27.91) +# spec file for package evolution-data-server (Version 2.27.90) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -58,7 +58,7 @@ Obsoletes: evolution-data-server-64bit Obsoletes: evolution-data-server-32bit %endif Summary: Evolution Data Server -Version: 2.27.91 +Version: 2.27.90 Release: 1 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.25/%{name}-%{version}.tar.bz2 # PATCH-NEEDS-REBASE evolution-data-server-1.11.5-cert-auth-complete.patch bgo253574 -- Fix has been submitted to bgo. (was PATCH-FIX-UPSTREAM) @@ -73,6 +73,8 @@ Patch7: dice-eds-changes.patch #Patch16: bnc-210959-eds-accept_ics.patch # PATCH-FEATURE-OPENSUSE evolution-data-server-shared-nss-db.patch hpj@novell.com -- Migrate to shared NSS database. Patch18: evolution-data-server-shared-nss-db.patch +# PATCH-FIX-UPSTREAM evolution-data-server-krb5-as-needed.patch bgo#591377 dominique-obs@leuenberger.net -- fix detection of krb5 in configure when using Wl,-as-needed +Patch19: evolution-data-server-krb5-as-needed.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -149,9 +151,16 @@ translation-update-upstream # NEEDS REBASE # %%patch16 %patch18 -p1 +%patch19 -p1 %build -NOCONFIGURE=1 gnome-autogen.sh +intltoolize --force --copy +# should use autoreconf, but libdb is broken +libtoolize --force --copy +aclocal +autoconf +automake -a +autoheader %{configure} \ --libexecdir=%{_libdir}/evolution-data-server \ %if %suse_version > 1100