From 48098620d1587d2887598ba080366fc95ecb1cb368cab618261a099c707154c2 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 20 Feb 2009 21:35:57 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/evolution-data-server?expand=0&rev=54

---
 evolution-data-server-2.25.90.tar.bz2 |  3 ---
 evolution-data-server-2.25.91.tar.bz2 |  3 +++
 evolution-data-server.changes         | 11 +++++++++++
 evolution-data-server.spec            | 22 +++++++++++++++-------
 4 files changed, 29 insertions(+), 10 deletions(-)
 delete mode 100644 evolution-data-server-2.25.90.tar.bz2
 create mode 100644 evolution-data-server-2.25.91.tar.bz2

diff --git a/evolution-data-server-2.25.90.tar.bz2 b/evolution-data-server-2.25.90.tar.bz2
deleted file mode 100644
index aa2349e..0000000
--- a/evolution-data-server-2.25.90.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e34c9d211f55449b5758d69960ba6fd6a0b9e7e531272ed2588747d760e5eb21
-size 7330533
diff --git a/evolution-data-server-2.25.91.tar.bz2 b/evolution-data-server-2.25.91.tar.bz2
new file mode 100644
index 0000000..ad00fcd
--- /dev/null
+++ b/evolution-data-server-2.25.91.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b056bd6976a9e69822e029d57c405244d1fc24113621e34348c721c5b4d9ba8a
+size 7334454
diff --git a/evolution-data-server.changes b/evolution-data-server.changes
index 57b80d4..e1eaee1 100644
--- a/evolution-data-server.changes
+++ b/evolution-data-server.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Feb 17 10:51:54 IST 2009 - msuman@suse.de
+
+- Update to version 2.25.91:
+  + Bugs fixed: bgo#266147, bgo#534938, bgo#555888, bgo#567861, 
+    bgo#569459, bgo#570653, bgo#571726, bgo#571761
+  + Updated translations
+- Remove option -DLDAP_DEPRECATED to CFLAGS, it is already 
+  specified internally upstream. 
+- Remove the MONO_PATH from the script.
+
 -------------------------------------------------------------------
 Tue Feb 10 20:44:12 CET 2009 - vuntz@novell.com
 
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index d6fc3dc..56764d0 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package evolution-data-server (Version 2.25.90)
+# spec file for package evolution-data-server (Version 2.25.91)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -58,8 +58,8 @@ Obsoletes:      evolution-data-server-64bit
 Obsoletes:      evolution-data-server-32bit
 %endif
 Summary:        Evolution Data Server
-Version:        2.25.90
-Release:        2
+Version:        2.25.91
+Release:        1
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.25/%{name}-%{version}.tar.bz2
 # PATCH-FIX-UPSTREAM evolution-data-server-1.11.5-cert-auth-complete.patch bgo253574 -- Fix has been submitted to bgo.
 Patch3:         evolution-data-server-1.11.5-cert-auth-complete.patch
@@ -163,9 +163,9 @@ aclocal
 autoconf
 automake -a
 autoheader
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED"
-export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED"
-export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED"
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" 
+export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" 
+export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" 
 %{configure} \
     --libexecdir=%{_libdir}/evolution-data-server \
 %if %suse_version > 1100
@@ -197,7 +197,7 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED"
 %fdupes $RPM_BUILD_ROOT
 %if %suse_version > 1100
 %{__mv} $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/evolution-data-server-%{_evo_version} $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/evolution-data-server-%{_evo_version}.bin
-echo -e "#!/bin/sh\n\nLD_LIBRARY_PATH=%{_libdir}/evoldap/lib MONO_PATH=%{_libdir}/mono:%{_libdir}/dice exec -a \"%{_libdir}/evolution-data-server/evolution-data-server-%{_evo_version}\" %{_libdir}/evolution-data-server/evolution-data-server-%{_evo_version}.bin \$@\n\nexit \$?" > $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/evolution-data-server-%{_evo_version}
+echo -e "#!/bin/bash\n\nLD_LIBRARY_PATH=%{_libdir}/evoldap/lib exec -a \"%{_libdir}/evolution-data-server/evolution-data-server-%{_evo_version}\" %{_libdir}/evolution-data-server/evolution-data-server-%{_evo_version}.bin \"\$@\"" > $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/evolution-data-server-%{_evo_version}
 %{__chmod} +x $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/evolution-data-server-%{_evo_version}
 %endif
 
@@ -232,6 +232,14 @@ echo -e "#!/bin/sh\n\nLD_LIBRARY_PATH=%{_libdir}/evoldap/lib MONO_PATH=%{_libdir
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Feb 16 2009 msuman@suse.de
+- Update to version 2.25.91:
+  + Bugs fixed: bgo#266147, bgo#534938, bgo#555888, bgo#567861,
+  bgo#569459, bgo#570653, bgo#571726, bgo#571761
+  + Updated translations
+- Remove option -DLDAP_DEPRECATED to CFLAGS, it is already
+  specified internally upstream.
+- Remove the MONO_PATH from the script.
 * Tue Feb 10 2009 vuntz@novell.com
 - Remove non-upstream translations: they'll get out-of-date.
 * Thu Feb 05 2009 vuntz@novell.com