X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=evolution-data-server.spec;h=6f0ce20007eee75ee7f240ae4e5dce7c8b6e7435;hb=755e46b14bd3db180ef7488b44bca7d9ee86848e;hp=d7f9ffe07fc24eba8c37789e6055897490b88aab;hpb=2a90a5bd66255d7e448db9f5f807b16f76c78cbe;p=packages%2Fevolution-data-server.git

diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index d7f9ffe..6f0ce20 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -7,29 +7,30 @@
 Summary:	Evolution data server
 Summary(pl):	Serwer danych Evolution
 Name:		evolution-data-server
-Version:	0.0.94
+Version:	1.0.0
 Release:	1
 License:	GPL
 Group:		Libraries
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/0.0/%{name}-%{version}.tar.bz2
-# Source0-md5:	934acfdcbd6ef8f9c799bc2d05a9eb3d
+Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/1.0/%{name}-%{version}.tar.bz2
+# Source0-md5:	0f4f0a188a1021c2bd11cf5d8e2b47a9
 Patch0:		%{name}-system_db.patch
-Patch1:		%{name}-locale-names.patch
+Patch1:		%{name}-GG-IM.patch
+Patch2:		%{name}-configure.patch
 URL:		http://www.ximian.com/products/ximian_evolution/
-BuildRequires:	ORBit2-devel >= 1:2.10.2
+BuildRequires:	ORBit2-devel >= 1:2.10.3
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	db-devel
 BuildRequires:	intltool
 BuildRequires:	libgnome-devel >= 2.6.1.1
-BuildRequires:	libsoup-devel >= 2.1.11
+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.11
+Requires:	libsoup >= 2.2.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -43,11 +44,15 @@ Summary:	Evolution data server development files
 Summary(pl):	Pliki programistyczne serwera danych evolution
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	GConf2-devel >= 2.6.1
-Requires:	ORBit2-devel >= 1:2.10.2
-Requires:	glib2-devel >= 1:2.4.1
-Requires:	libbonobo-devel >= 2.6.0
+# 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
@@ -73,8 +78,8 @@ Statyczne biblioteki serwera danych Evolution.
 %setup -q 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
-mv po/{no,nb}.po
 rm -rf libdb
 
 %build
@@ -112,6 +117,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