X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=evolution.spec;h=82758773b7bede9a74e46e51eea280f6cdbf8ce6;hb=ef17012b924024906a7e9d69a9dfbce31bb50fc3;hp=40c777b544fd5e0c02c4c9b8f4b3ad5d84efca29;hpb=6e783d8f4af7b63b0c6d6cb7ff94cf717ec000e3;p=packages%2Fevolution.git

diff --git a/evolution.spec b/evolution.spec
index 40c777b..8275877 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,5 +1,5 @@
 %define		mver		1.2
-%define		subver		0
+%define		subver		1
 
 Summary:	The GNOME Email/Calendar/Addressbook Suite
 Summary(pl):	Klient poczty dla GNOME/Kalendarz/Ksi±¿ka Adresowa
@@ -7,13 +7,14 @@ Summary(pt_BR):	Cliente de email integrado com calend
 Summary(zh_CN):	Evolution - GNOME¸öÈ˺͹¤×÷×éÐÅÏ¢¹ÜÀí¹¤¾ß(°üÀ¨µç×ÓÓʼþ£¬ÈÕÀúºÍµØÖ·±¡)
 Name:		evolution
 Version:	%{mver}.%{subver}
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/Mail
 Source0:	ftp://ftp.gnome.org/mirror/gnome.org/sources/evolution/%{mver}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-nostaticdb3.patch
 Patch1:		%{name}-am.patch
 Patch2:		%{name}-omf.patch
+Patch3:		%{name}-libpisock.patch
 URL:		http://www.ximian.com/products/ximian_evolution/
 BuildRequires:	GConf-devel >= 1.0.7
 BuildRequires:	ORBit-devel >= 0.5.8
@@ -24,7 +25,7 @@ BuildRequires:	bonobo-conf-devel >= 0.16
 BuildRequires:	bonobo-devel >= 1.0.15-2
 BuildRequires:	flex
 BuildRequires:	freetype-devel >= 2.0.5
-BuildRequires:	gal-devel >= 0.21
+BuildRequires:	gal-devel >= 0.22
 BuildRequires:	gdk-pixbuf-gnome-devel >= 0.9.0
 BuildRequires:	gdk-pixbuf-devel >= 0.18.0
 BuildRequires:	gettext-devel
@@ -59,6 +60,7 @@ Requires:	oaf >= 0.6.7
 Requires:	libglade >= 0.17
 Requires:	gtkhtml >= 1.0.0-2
 Requires:	db3 = 3.1.17
+Requires:	gal >= 0.22
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define         _prefix         /usr/X11R6
@@ -88,7 +90,7 @@ Summary(zh_CN):	Evolution
 Group:		Development/Libraries
 Requires:	cyrus-sasl-devel
 Requires:	freetype-devel
-Requires:	gal-devel
+Requires:	gal-devel >= 0.22
 Requires:	gdk-pixbuf-devel
 Requires:	gnome-libs-devel
 Requires:	gnome-print-devel
@@ -132,11 +134,26 @@ Pakiet zawiera statyczne biblioteki Evolution.
 Este pacote contém as bibliotecas estáticas para desenvolvimento de
 aplicações.
 
+%package pilot
+Summary:	Evolution conduits for gnome-pilot
+Summary(pl):	Dodatki do wymiany danych z gnome-pilot
+Group:		Development/Libraries
+Requires:	%{name} = %{version}
+
+%description pilot
+This package contains conduits needed by gnome-pilot to synchronize
+your Palm with Evolution.
+
+%description pilot -l pl
+Ten pakiet zawiera dodatki do synchronizacji danych Evolution z
+Palmem.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 sed -e s/AM_GNOME_GETTEXT/AM_GNU_GETTEXT/ configure.in > configure.in.tmp
@@ -151,19 +168,19 @@ xml-i18n-toolize --copy --force
 cd libical
 %{__autoconf}
 cd ..
-CFLAGS="%{rpmcflags} -I/usr/include/orbit-1.0"
+CFLAGS="%{rpmcflags} -I/usr/include/orbit-1.0 -I/usr/include"
 %configure \
 	--disable-gtk-doc \
-	--enable-pilot-conduits=no \
+	--enable-pilot-conduits=yes \
 	--with-openldap=yes \
 	--without-static-ldap \
 	--enable-nntp=no \
-	--with-gnome-includes=/usr/X11R6/include/gnome-vfs-1.0/ \
+	--with-gnome-includes=%{_includedir}/gnome-vfs-1.0/ \
 	--enable-file-locking=fcntl --enable-dot-locking=no \
 	--with-nspr-includes="/usr/include/nspr" \
 	--with-nss-includes="/usr/include/nss" \
 	--with-nspr-libs="/usr/lib" \
-	--with-nss-libs="/usr/lib" 
+	--with-nss-libs="/usr/lib"
 %{__make} \
 	GTKHTML_DATADIR=%{_datadir}/idl
 
@@ -224,3 +241,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/*.a
 %{_libdir}/evolution/*/*/*.a
+
+%files pilot
+%defattr(644,root,root,755)
+%{_libdir}/gnome-pilot/*
+%{_datadir}/gnome-pilot/*