X-Git-Url: https://git.pld-linux.org/?p=packages%2Fevolution-data-server.git;a=blobdiff_plain;f=evolution-data-server.spec;h=d7b717b5c23e8f3efe789591d98d0b2198d79880;hp=1956c32edd1d46ae0a27de212fe9f55d48768a1d;hb=75af5f223fa2079cc3e070ce9da59a4c3307be0e;hpb=028894304f1585c70d3c48379d7f81ffcd52921c

diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 1956c32..d7b717b 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
-Release:	1
+Version:	1.0.2
+Release:	2
 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/%{name}/1.0/%{name}-%{version}.tar.bz2
+# Source0-md5:	ca13b5dd751cd30c55e889d9a07e70fb
 Patch0:		%{name}-system_db.patch
-Patch1:		%{name}-locale-names.patch
-Patch2:		%{name}-GG-IM.patch
+Patch1:		%{name}-GG-IM.patch
+Patch2:		%{name}-configure.patch
+Patch3:		%{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.0
 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.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -44,11 +46,15 @@ Summary:	Evolution data server development files
 Summary(pl):	Pliki programistyczne serwera danych evolution
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+# for all but libegroupwise
 Requires:	GConf2-devel >= 2.6.2
 Requires:	ORBit2-devel >= 1:2.10.3
 Requires:	glib2-devel >= 1:2.4.4
 Requires:	libbonobo-devel >= 2.6.2
+Requires:	libgnome-devel >= 2.6.1.1
 Requires:	libxml2-devel
+# for libegroupwise
+Requires:	libsoup-devel >= 2.2.0
 
 %description devel
 This package contains the files necessary to develop applications
@@ -75,15 +81,15 @@ Statyczne biblioteki serwera danych Evolution.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -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}
@@ -114,6 +120,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