X-Git-Url: https://git.pld-linux.org/?p=packages%2Fevolution-data-server.git;a=blobdiff_plain;f=evolution-data-server.spec;h=bec41fcc233b3a0c31d1ea2f084ad47828c5edcd;hp=eec0a64eeb6fce194854d8ba4601407d76f6a92a;hb=966c73dd084966f0daad6f35df1f67f6f6642898;hpb=353eadf1f5953c56954a571e971010d8c3165118;ds=sidebyside

diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index eec0a64..bec41fc 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -1,35 +1,37 @@
-
 #
 # todo:
 # - system libical
 #
-
 %define		mver		1.0
 
 Summary:	Evolution data server
 Summary(pl):	Serwer danych Evolution
 Name:		evolution-data-server
-Version:	0.0.3
-Release:	0.10
+Version:	1.0.3
+Release:	1
 License:	GPL
 Group:		Libraries
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/0.0/%{name}-%{version}.tar.gz
-# Source0-md5:	bcacfd623db973a100deb67f0b7d8a38
+Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/1.0/%{name}-%{version}.tar.bz2
+# Source0-md5:	6fc9aa8178540828c0056e2b070b7546
 Patch0:		%{name}-system_db.patch
+Patch1:		%{name}-GG-IM.patch
+Patch2:		%{name}-workaround-cal-backend-leak.patch
 URL:		http://www.ximian.com/products/ximian_evolution/
-BuildRequires:	ORBit2-devel >= 2.8.0
+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.0
-BuildRequires:	libsoup-devel >= 2.1.2
+BuildRequires:	libgnome-devel >= 2.6.1.1
+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.2.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -42,7 +44,16 @@ Serwer danych Evolution dla kalendarza i ksi
 Summary:	Evolution data server development files
 Summary(pl):	Pliki programistyczne serwera danych evolution
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+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
@@ -56,7 +67,7 @@ korzystaj
 Summary:	Evolution data server static libraries
 Summary(pl):	Statyczne biblioteki serwera danych Evolution
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 Evolution data server static libraries.
@@ -67,6 +78,8 @@ Statyczne biblioteki serwera danych Evolution.
 %prep
 %setup -q 
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 rm -rf libdb
 
@@ -74,10 +87,19 @@ rm -rf libdb
 glib-gettextize --copy --force
 intltoolize --copy --force
 %{__libtoolize}
-%{__aclocal} -I %{_aclocaldir}/gnome2-macros
+%{__aclocal}
 %{__autoheader}
 %{__autoconf}
 %{__automake}
+
+cd calendar/libical
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
+%{__autoconf}
+%{__automake}
+cd ../..
+
 %configure \
 	--enable-gtk-doc \
 	--enable-static \
@@ -96,6 +118,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