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

diff --git a/evolution.spec b/evolution.spec
index 735449a..8275877 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,50 +1,66 @@
+%define		mver		1.2
+%define		subver		1
+
 Summary:	The GNOME Email/Calendar/Addressbook Suite
 Summary(pl):	Klient poczty dla GNOME/Kalendarz/Ksi±¿ka Adresowa
 Summary(pt_BR):	Cliente de email integrado com calendário e catálogo de endereços
 Summary(zh_CN):	Evolution - GNOME¸öÈ˺͹¤×÷×éÐÅÏ¢¹ÜÀí¹¤¾ß(°üÀ¨µç×ÓÓʼþ£¬ÈÕÀúºÍµØÖ·±¡)
 Name:		evolution
-Version:	1.0.8
+Version:	%{mver}.%{subver}
 Release:	2
 License:	GPL
 Group:		Applications/Mail
-Source0:	ftp://ftp.gnome.org/pub/gnome/stable/sources/evolution/%{name}-%{version}.tar.gz
+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
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bison
-BuildRequires:	bonobo-conf-devel >= 0.14
+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.19.2
+BuildRequires:	gal-devel >= 0.22
 BuildRequires:	gdk-pixbuf-gnome-devel >= 0.9.0
+BuildRequires:	gdk-pixbuf-devel >= 0.18.0
 BuildRequires:	gettext-devel
 BuildRequires:	gnome-libs-devel >= 1.2.9
-BuildRequires:	gnome-print-devel >= 0.25
-BuildRequires:	gnome-vfs-devel >= 1.0.1
+BuildRequires:	gnome-print-devel >= 0.35
+BuildRequires:	gnome-vfs-devel >= 1.0.5
 BuildRequires:	gtk+-devel > 1.2.0
-BuildRequires:	gtkhtml-devel >= 1.0.2
-BuildRequires:	intltool
+BuildRequires:	gtkhtml-devel >= 1.1.5
+BuildRequires:	intltool >= 0.18
 BuildRequires:	libglade-gnome-devel >= 0.14
+BuildRequires:	libglade-devel >= 0.14
+BuildRequires:	libtool
 BuildRequires:	libunicode-devel >= 0.4
 BuildRequires:	nspr-devel
 BuildRequires:	nss-devel
-BuildRequires:	oaf-devel >= 0.6.7
+BuildRequires:	oaf-devel >= 0.6.10
 BuildRequires:	openldap-devel >= 2.0.0
+#propably some m4 stuff is buggy so opeldap-static is required at now... :(
+BuildRequires:	openldap-static >= 2.0.0
 BuildRequires:	python
-BuildRequires:	scrollkeeper
+BuildRequires:	scrollkeeper >= 0.1.4
+BuildRequires:	libxml >= 1.8.17
+BuildRequires:	soup-devel >= 0.7.4
+BuildRequires:	db3 = 3.1.17
+BuildRequires:	pkgconfig
+Requires(post,postun):	/sbin/ldconfig
+Requires(post,postun):	/usr/bin/scrollkeeper-update
 Requires:	scrollkeeper >= 0.1.4
 Requires:	bonobo >= 1.0.14
 Requires:	GConf >= 1.0.7
 Requires:	oaf >= 0.6.7
 Requires:	libglade >= 0.17
 Requires:	gtkhtml >= 1.0.0-2
-Prereq:		/sbin/ldconfig
-Prereq:		scrollkeeper
+Requires:	db3 = 3.1.17
+Requires:	gal >= 0.22
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define         _prefix         /usr/X11R6
@@ -74,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
@@ -118,10 +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
@@ -130,26 +162,27 @@ rm -f missing
 xml-i18n-toolize --copy --force
 %{__libtoolize}
 %{__gettextize}
-aclocal -I %{_aclocaldir}/gnome
+%{__aclocal} -I %{_aclocaldir}/gnome
 %{__autoconf}
 %{__automake}
 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 \
-	--with-static-ldap=no \
-	--enable-nntp=yes \
-	--with-gnome-includes=/usr/X11R6/include/gnome-vfs-1.0/ \
+	--without-static-ldap \
+	--enable-nntp=no \
+	--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"
-%{__make}
+%{__make} \
+	GTKHTML_DATADIR=%{_datadir}/idl
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -158,6 +191,7 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT \
 	desktopdir=%{_applnkdir}/Network/Mail \
 	omf_dest_dir=%{_omf_dest_dir}/%{name} \
+	GTKHTML_DATADIR=%{_datadir}/idl \
 	HTML_DIR=%{_gtkdocdir}
 
 %find_lang %{name} --with-gnome --all-name
@@ -184,7 +218,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/evolution/*
 %dir %{_libdir}/evolution/*/*
 %{_mandir}/man1/*
-%{_libdir}/evolution/camel-providers/*/*.urls
+%{_libdir}/evolution/%{mver}/camel-providers/*.urls
 %{_datadir}/evolution
 %{_datadir}/oaf/*.oaf
 %{_datadir}/gnome/ui/*
@@ -199,7 +233,7 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/*.??
-%attr(755,root,root) %{_libdir}/evolution/*/*/*.la
+%{_libdir}/evolution/*/*/*.la
 %{_includedir}/*
 %{_gtkdocdir}/*
 
@@ -207,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/*