X-Git-Url: https://git.pld-linux.org/?p=packages%2Fevolution-data-server.git;a=blobdiff_plain;f=evolution-data-server.spec;h=e7838c800c31d01886b3c7c7de6b6eb66722467e;hp=f2e4a2164f48e1afcf2d225bd7d4b55239e1cccb;hb=42a2ef57874e53b0b67ef47a70ef43b83ee6f503;hpb=afb88271e178ccd7862fb14c1e15caca331b254a

diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index f2e4a21..e7838c8 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -1,8 +1,8 @@
 #
 # Conditional build:
 %bcond_without	apidocs		# do not build and package API docs
-%bcond_without	kerberos5	# build without kerberos5 support
-%bcond_without	ldap		# build without ldap support
+%bcond_without	kerberos5	# build without Kerberos5 support
+%bcond_without	ldap		# build without LDAP support
 %bcond_without	static_libs	# do not build static libs
 %bcond_without	uoa		# single sign-on (aka Ubuntu Online Accounts)
 %bcond_without	vala		# do not build Vala API
@@ -12,12 +12,12 @@
 Summary:	Evolution data server
 Summary(pl.UTF-8):	Serwer danych Evolution
 Name:		evolution-data-server
-Version:	3.18.0
+Version:	3.18.2
 Release:	1
 License:	LGPL v2+
 Group:		X11/Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/3.18/%{name}-%{version}.tar.xz
-# Source0-md5:	a0f234060313b0399e64ab0b09aca25a
+# Source0-md5:	bd6b559fc7fa4bf10f2f70d9afad8f83
 URL:		http://www.gnome.org/projects/evolution/
 BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake >= 1:1.11
@@ -48,11 +48,10 @@ BuildRequires:	libtool >= 2:2.2
 BuildRequires:	libxml2-devel >= 1:2.6.31
 BuildRequires:	nspr-devel >= 4
 BuildRequires:	nss-devel >= 3
-%{?with_ldap:BuildRequires:	openldap-evolution-devel >= 2.4.6}
+%{?with_ldap:BuildRequires:	openldap-devel >= 2.4.6}
 BuildRequires:	pkgconfig
 %{?with_uoa:BuildRequires:	rest-devel >= 0.7}
 BuildRequires:	rpmbuild(macros) >= 1.304
-BuildRequires:	sed >= 4.0
 BuildRequires:	sqlite3-devel >= 3.7.17
 BuildRequires:	tar >= 1:1.22
 %{?with_vala:BuildRequires:	vala >= 2:0.22.0}
@@ -210,9 +209,6 @@ API serwera danych Evolution dla języka Vala.
 %prep
 %setup -q
 
-# kill -L$withval/lib
-%{__sed} -i -e 's/DB_LIBS="-L[^ "]* /DB_LIBS="/;s/ICONV_LIBS="[^ "]*/ICONV_LIBS="/' configure.ac
-
 %build
 %{__gtkdocize}
 %{__intltoolize}
@@ -222,28 +218,18 @@ API serwera danych Evolution dla języka Vala.
 %{__autoconf}
 %{__automake}
 
-# Set LIBS so that configure will be able to link with static LDAP libraries,
-# which depend on Cyrus SASL and OpenSSL.
-if pkg-config openssl ; then
-	LIBS="-lsasl2 `pkg-config --libs openssl`"
-else
-	LIBS="-lsasl2 -lssl -lcrypto"
-fi
-export LIBS
-
 %configure \
+	DB_LIBS="-ldb" \
+	ac_cv_libiconv=no \
 	%{?with_kerberos5:--with-krb5=%{_prefix} --with-krb5-libs=%{_libdir}} \
 	%{!?with_kerberos5:--with-krb5=no} \
-	%{?with_ldap:--with-openldap=%{_libdir}/evolution-openldap} \
-	%{?with_ldap:--with-static-ldap=yes} \
-	%{!?with_ldap:--with-openldap=no} \
+	--with-openldap%{!?with_ldap:=no} \
 	--enable-smime \
 	--enable-ipv6 \
 	%{__enable_disable apidocs gtk-doc} \
 	%{__enable_disable static_libs static} \
 	%{__enable_disable vala vala-bindings} \
 	%{!?with_uoa:--disable-uoa} \
-	--with-libdb=%{_libdir} \
 	--with-html-dir=%{_gtkdocdir} \
 	--disable-silent-rules