Author: megabajt Date: Tue Mar 13 18:14:06 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.10.0; merged changes from DEVEL
---- Files affected: SPECS: evolution.spec (1.212 -> 1.213) ---- Diffs: ================================================================ Index: SPECS/evolution.spec diff -u SPECS/evolution.spec:1.212 SPECS/evolution.spec:1.213 --- SPECS/evolution.spec:1.212 Wed Feb 14 01:07:54 2007 +++ SPECS/evolution.spec Tue Mar 13 19:14:00 2007 @@ -5,19 +5,19 @@ %bcond_without kerberos5 # build without kerberos5 support %bcond_without pilot # build without pilot support # -%define basever 2.8 +%define basever 2.10 # Summary: The GNOME Email/Calendar/Addressbook Suite Summary(pl.UTF-8): Klient poczty dla GNOME/Kalendarz/Książka Adresowa Summary(pt_BR.UTF-8): Cliente de email integrado com calendário e catálogo de endereços Summary(zh_CN.UTF-8): Evolution - GNOME个人和工作组信息管理工具(包括电子邮件，日历和地址薄) Name: evolution -Version: 2.8.3 -Release: 2 +Version: 2.10.0 +Release: 1 License: GPL v2 Group: Applications/Mail -Source0: http://ftp.gnome.org/pub/gnome/sources/evolution/2.8/%{name}-%{version}.tar.bz2 -# Source0-md5: 099876b347b114ec08ce6998b4a48d8c +Source0: http://ftp.gnome.org/pub/gnome/sources/evolution/2.10/%{name}-%{version}.tar.bz2 +# Source0-md5: 68d32e518f235bea9d768ae55e91bffc Source1: %{name}-gg16.png Source2: %{name}-gg48.png Source3: %{name}-addressbook.desktop @@ -27,33 +27,36 @@ Patch0: %{name}-nolibs.patch Patch1: %{name}-gnome-icon-theme.patch Patch2: %{name}-as_needed-fix.patch -Patch3: %{name}-pilot-link-0.12.patch Patch4: %{name}-groupwise-features-link.patch URL: http://www.gnome.org/projects/evolution/ -BuildRequires: GConf2-devel >= 2.16.0 -BuildRequires: ORBit2-devel >= 1:2.14.4 +BuildRequires: GConf2-devel >= 2.18.0.1 +BuildRequires: ORBit2-devel >= 1:2.14.7 +BuildRequires: atk-devel >= 1:1.18.0 BuildRequires: autoconf >= 2.52 BuildRequires: automake BuildRequires: bison -BuildRequires: dbus-glib-devel >= 0.71 -BuildRequires: evolution-data-server-devel >= 1.8.2 +BuildRequires: dbus-glib-devel >= 0.73 +BuildRequires: evolution-data-server-devel >= 1.10.0 BuildRequires: flex -BuildRequires: freetype-devel >= 2.0.5 BuildRequires: gettext-devel BuildRequires: gnome-common >= 2.12.0 +BuildRequires: gnome-doc-utils >= 0.10.1 %{?with_pilot:BuildRequires: gnome-pilot-devel >= 2.0.14} -BuildRequires: gnome-vfs2-devel >= 2.16.3 -BuildRequires: gtk-doc >= 1.7 -BuildRequires: gtkhtml-devel >= 3.12.1 +BuildRequires: gnome-vfs2-devel >= 2.18.0.1 +BuildRequires: gtk-doc >= 1.8 +BuildRequires: gtk+2-devel >= 2:2.10.10 +BuildRequires: gtkhtml-devel >= 3.14.0 +BuildRequires: hal-devel >= 0.5.7.1 %{?with_kerberos5:BuildRequires: heimdal-devel} -BuildRequires: intltool >= 0.35.0 +BuildRequires: intltool >= 0.35.5 +BuildRequires: libbonoboui-devel >= 2.18.0 BuildRequires: libglade2-devel >= 1:2.6.0 -BuildRequires: libgnomeprintui-devel >= 2.12.1 -BuildRequires: libgnomeui-devel >= 2.16.1 +BuildRequires: libgnomeprintui-devel >= 2.18.0 +BuildRequires: libgnomeui-devel >= 2.18.0 BuildRequires: libnotify-devel >= 0.3.0 -BuildRequires: libsoup-devel >= 2.2.98 +BuildRequires: libsoup-devel >= 2.2.100 BuildRequires: libtool -BuildRequires: libxml2 >= 1:2.6.27 +BuildRequires: libxml2-devel >= 1:2.6.27 BuildRequires: nspr-devel BuildRequires: nss-devel %{?with_ldap:BuildRequires: openldap-devel >= 2.3.0} @@ -64,15 +67,16 @@ BuildRequires: rpmbuild(macros) >= 1.311 BuildRequires: scrollkeeper >= 0.1.4 BuildRequires: which -Requires(post,postun): gtk+2 >= 2:2.10.6 +Requires(post,postun): gtk+2 +Requires(post,postun): hicolor-icon-theme Requires(post,postun): scrollkeeper -Requires(post,preun): GConf2 >= 2.16.0 +Requires(post,preun): GConf2 Requires: %{name}-component = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} -Requires: GConf2 >= 2.16.0 +Requires: GConf2 >= 2.18.0.1 Requires: bonobo-activation -Requires: evolution-data-server >= 1.8.2 -Requires: gtkhtml >= 3.12.1 +Requires: evolution-data-server >= 1.10.0 +Requires: gtkhtml >= 3.14.0 Requires: hicolor-icon-theme Requires: libglade2 >= 1:2.6.0 Requires: psmisc @@ -114,14 +118,14 @@ Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} Requires: cyrus-sasl-devel -Requires: evolution-data-server-devel >= 1.8.2 +Requires: evolution-data-server-devel >= 1.10.0 Requires: freetype-devel -Requires: gnome-vfs2-devel >= 2.16.3 -Requires: gtkhtml-devel >= 3.12.1 +Requires: gnome-vfs2-devel >= 2.18.0.1 +Requires: gtkhtml-devel >= 3.14.0 Requires: libglade2-devel >= 1:2.6.0 -Requires: libgnomeprintui-devel >= 2.12.1 -Requires: libgnomeui-devel >= 2.16.1 -Requires: libsoup-devel >= 2.2.98 +Requires: libgnomeprintui-devel >= 2.18.0 +Requires: libgnomeui-devel >= 2.18.0 +Requires: libsoup-devel >= 2.2.100 Requires: nspr-devel Requires: nss-devel %{?with_ldap:Requires: openldap-devel >= 2.3.0} @@ -221,7 +225,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p0 %patch4 -p1 %build @@ -234,6 +237,7 @@ %{__automake} %configure \ --enable-gtk-doc \ + --disable-scrollkeeper \ %{?with_pilot:--enable-pilot-conduits=yes} \ %{!?with_pilot:--enable-pilot-conduits=no} \ %{?with_ldap:--with-openldap=yes} \ @@ -349,6 +353,7 @@ %{_datadir}/evolution/%{basever}/*.xml %lang(de) %dir %{_datadir}/evolution/%{basever}/default/de +%lang(es) %dir %{_datadir}/evolution/%{basever}/default/es %lang(fi) %dir %{_datadir}/evolution/%{basever}/default/fi %lang(fr) %dir %{_datadir}/evolution/%{basever}/default/fr %lang(ja) %dir %{_datadir}/evolution/%{basever}/default/ja @@ -371,8 +376,7 @@ %{_datadir}/idl/evolution-%{basever}/Evolution.idl %{_datadir}/idl/evolution-%{basever}/Evolution-Shell.idl -%{_iconsdir}/hicolor/*/apps/*.png -%{_pixmapsdir}/*.png +%{_iconsdir}/hicolor/*/apps/* %{_omf_dest_dir}/%{name} @@ -402,12 +406,14 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/evolution/%{basever}/components/libevolution-mail.so %attr(755,root,root) %{_libdir}/evolution/%{basever}/plugins/*mail*.so +%attr(755,root,root) %{_libdir}/evolution/%{basever}/plugins/*imap*.so %attr(755,root,root) %{_libdir}/evolution/%{basever}/plugins/*exchange*.so %attr(755,root,root) %{_libdir}/evolution/%{basever}/plugins/*print-message*.so %attr(755,root,root) %{_libdir}/evolution/%{basever}/plugins/*itip*.so %attr(755,root,root) %{_libdir}/evolution/%{basever}/plugins/*mark-all-read*.so %attr(755,root,root) %{_libdir}/evolution/%{basever}/plugins/*startup-wizard*.so %{_libdir}/evolution/%{basever}/plugins/*mail*.eplug +%{_libdir}/evolution/%{basever}/plugins/*imap*.eplug %{_libdir}/evolution/%{basever}/plugins/*exchange*.eplug %{_libdir}/evolution/%{basever}/plugins/*print-message*.eplug %{_libdir}/evolution/%{basever}/plugins/*itip*.eplug @@ -425,6 +431,7 @@ %{_datadir}/evolution/%{basever}/etspec/*contact-list* %lang(de) %{_datadir}/evolution/%{basever}/default/de/mail +%lang(es) %{_datadir}/evolution/%{basever}/default/es/mail %lang(fi) %{_datadir}/evolution/%{basever}/default/fi/mail %lang(fr) %{_datadir}/evolution/%{basever}/default/fr/mail %lang(ja) %{_datadir}/evolution/%{basever}/default/ja/mail @@ -510,6 +517,21 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.213 2007/03/13 18:14:00 megabajt +- updated to 2.10.0; merged changes from DEVEL + +Revision 1.212.2.4 2007/03/07 17:43:17 megabajt +- updated deps + +Revision 1.212.2.3 2007/03/04 22:08:48 patrys +- missing dir + +Revision 1.212.2.2 2007/03/04 21:58:47 patrys +- patch 3 applied upstream + +Revision 1.212.2.1 2007/03/04 21:57:21 patrys +- 2.9.92 + Revision 1.212 2007/02/14 00:07:54 qrczak - evolution-groupwise-features-link.patch: missing #include to avoid an unresolved reference to _ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/evolution.spec?r1=1.212&r2=1.213&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
