From 51cb5b152f67368d2eb713b19ae2566b8687fba0 Mon Sep 17 00:00:00 2001
From: Patryk Zawadzki <patrys@room-303.com>
Date: Wed, 18 Mar 2009 12:12:40 +0000
Subject: [PATCH 1/1] - bump BR:

Changed files:
    evolution-data-server.spec -> 1.133
---
 evolution-data-server.spec | 68 ++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 40 deletions(-)

diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 6fc7a66..b8eef12 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -1,25 +1,22 @@
 #
-# todo:
-# - system libical
-#
 # Conditional build:
 %bcond_without	kerberos5	# build without kerberos5 support
 %bcond_without	ldap		# build without ldap support
 #
-%define		basever		2.24
+%define		basever		2.26
 %define		apiver		1.2
 Summary:	Evolution data server
 Summary(pl.UTF-8):	Serwer danych Evolution
 Name:		evolution-data-server
-Version:	2.24.4.1
+Version:	2.26.0
 Release:	1
 License:	LGPL v2+
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/2.24/%{name}-%{version}.tar.bz2
-# Source0-md5:	3d6234ec417b2d9ab8dac6c45ec6ba97
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/2.26/%{name}-%{version}.tar.bz2
+# Source0-md5:	d010845a4ee9604f050403b106c2f416
 Patch0:		%{name}-ntlm-ldap.patch
 URL:		http://www.gnome.org/projects/evolution/
-BuildRequires:	GConf2-devel >= 2.24.0
+BuildRequires:	GConf2-devel >= 2.26.0
 BuildRequires:	ORBit2-devel >= 1:2.14.8
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -27,17 +24,19 @@ BuildRequires:	bison
 BuildRequires:	cyrus-sasl-devel
 BuildRequires:	db-devel
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.18.0
+BuildRequires:	glib2-devel >= 1:2.20.0
 BuildRequires:	gnome-common >= 2.20.0
-BuildRequires:	gnome-keyring-devel >= 2.24.0
-BuildRequires:	gnome-vfs2-devel >= 2.24.0
-BuildRequires:	gtk+2-devel >= 2:2.14.0
+BuildRequires:	gnome-keyring-devel >= 2.26.0
+BuildRequires:	gtk+2-devel >= 2:2.16.0
 BuildRequires:	gtk-doc >= 1.9
-BuildRequires:	intltool >= 0.37.0
+BuildRequires:	intltool >= 0.40.0
 %{?with_kerberos5:BuildRequires:	krb5-devel}
+BuildRequires:	libbonobo-devel >= 2.24.0
 BuildRequires:	libglade2-devel >= 1:2.6.2
 BuildRequires:	libgnomeui-devel >= 2.24.0
-BuildRequires:	libsoup-devel >= 2.4.0
+BuildRequires:	libgweather-devel >= 2.26.0
+BuildRequires:	libical-devel >= 0.43
+BuildRequires:	libsoup-devel >= 2.26.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 1:2.6.31
@@ -94,17 +93,17 @@ Summary:	Evolution data server development files
 Summary(pl.UTF-8):	Pliki programistyczne serwera danych evolution
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-%{?with_kerberos5:Requires:	krb5-devel}
-# for all but libegroupwise
-Requires:	GConf2-devel >= 2.24.0
+Requires:	GConf2-devel >= 2.26.0
 Requires:	ORBit2-devel >= 1:2.14.8
-Requires:	glib2-devel >= 1:2.18.0
-Requires:	gtk+2-devel >= 2:2.14.0
+Requires:	glib2-devel >= 1:2.20.0
+Requires:	gtk+2-devel >= 2:2.16.0
+%{?with_kerberos5:Requires:	krb5-devel}
+Requires:	libbonobo-devel >= 2.24.0
 Requires:	libglade2-devel >= 1:2.6.2
-Requires:	libgnomeui-devel >= 2.24.0
+Requires:	libical-devel >= 0.43
+Requires:	libsoup-devel >= 2.26.0
 Requires:	libxml2-devel >= 1:2.6.31
-# for libegroupwise
-Requires:	libsoup-devel >= 2.4.0
+Requires:	sqlite3-devel
 
 %description devel
 This package contains the files necessary to develop applications
@@ -155,14 +154,6 @@ sed -i -e 's/DB_LIBS="-L[^ "]* /DB_LIBS="/;s/ICONV_LIBS="[^ "]*/ICONV_LIBS="/' c
 %{__autoconf}
 %{__automake}
 
-cd calendar/libical
-%{__libtoolize}
-%{__aclocal}
-%{__autoheader}
-%{__autoconf}
-%{__automake}
-cd ../..
-
 # 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
@@ -185,26 +176,23 @@ export LIBS
 	--with-nspr-libs=%{_libdir} \
 	--with-nss-includes=%{_includedir}/nss \
 	--with-nss-libs=%{_libdir} \
-	--with-libdb=%{_libdir}
+	--with-libdb=%{_libdir} \
+	--with-html-dir=%{_gtkdocdir}
 
-%{__make} \
-	HTML_DIR=%{_gtkdocdir} \
-	GTKHTML_DATADIR=%{_datadir}/idl
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{schemadir}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	GTKHTML_DATADIR=%{_datadir}/idl \
-	HTML_DIR=%{_gtkdocdir} \
-	pkgconfigdir=%{_pkgconfigdir}
-
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}-%{apiver}/{camel-providers,extensions}/*.{la,a}
+	HTML_DIR=%{_gtkdocdir}
 
-install -d $RPM_BUILD_ROOT%{schemadir}
 install addressbook/backends/ldap/evolutionperson.schema $RPM_BUILD_ROOT%{schemadir}
 
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}-%{apiver}/{camel-providers,extensions}/*.{la,a}
+
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/la
 
 %find_lang %{name} --all-name
-- 
2.44.0