X-Git-Url: https://git.pld-linux.org/?p=packages%2Fevolution-data-server.git;a=blobdiff_plain;f=evolution-data-server.spec;h=d145d8f6d5bb8db91310ed7a3b0a3d352d837ee4;hp=2cf854b445bc92916f26fbf805354d2732d83c32;hb=e2c48f95725974c292420226d95d6dbf9bb5df4f;hpb=6de52a0deef8df6aa6041551c5dbdc9f5b050224

diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 2cf854b..d145d8f 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -7,30 +7,32 @@
 Summary:	Evolution data server
 Summary(pl):	Serwer danych Evolution
 Name:		evolution-data-server
-Version:	0.0.96
+Version:	1.0.4
 Release:	1
 License:	GPL
 Group:		Libraries
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/0.0/%{name}-%{version}.tar.bz2
-# Source0-md5:	ef6c271be54059d9fd4e5cac90a1bd6e
+Source0:	http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
+# Source0-md5:	5c9c6cac9b65d392e50ea3214022cb5b
 Patch0:		%{name}-system_db.patch
-Patch1:		%{name}-locale-names.patch
-Patch2:		%{name}-GG-IM.patch
+Patch1:		%{name}-GG-IM.patch
+Patch2:		%{name}-workaround-cal-backend-leak.patch
 URL:		http://www.ximian.com/products/ximian_evolution/
 BuildRequires:	ORBit2-devel >= 1:2.10.3
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	db-devel
+BuildRequires:	gnome-common >= 2.8.0
 BuildRequires:	intltool
 BuildRequires:	libgnome-devel >= 2.6.1.1
-BuildRequires:	libsoup-devel >= 2.1.12
+BuildRequires:	libsoup-devel >= 2.2.2
+BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	openldap-devel
 BuildRequires:	pkgconfig
 Requires(post,postun):	/sbin/ldconfig
 Requires(post,postun):	/usr/bin/scrollkeeper-update
 Requires(post):		GConf2
-Requires:	libsoup >= 2.1.12
+Requires:	libsoup >= 2.2.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -52,7 +54,7 @@ Requires:	libbonobo-devel >= 2.6.2
 Requires:	libgnome-devel >= 2.6.1.1
 Requires:	libxml2-devel
 # for libegroupwise
-Requires:	libsoup-devel >= 2.1.12
+Requires:	libsoup-devel >= 2.2.2
 
 %description devel
 This package contains the files necessary to develop applications
@@ -80,14 +82,13 @@ Statyczne biblioteki serwera danych Evolution.
 %patch1 -p1
 %patch2 -p1
 
-mv po/{no,nb}.po
 rm -rf libdb
 
 %build
 glib-gettextize --copy --force
 intltoolize --copy --force
 %{__libtoolize}
-%{__aclocal} -I %{_aclocaldir}/gnome2-macros
+%{__aclocal}
 %{__autoheader}
 %{__autoconf}
 %{__automake}
@@ -118,6 +119,8 @@ rm -rf $RPM_BUILD_ROOT
 	HTML_DIR=%{_gtkdocdir} \
 	pkgconfigdir=%{_pkgconfigdir}
 
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
 %find_lang %{name} --all-name
 
 %clean