packages: evolution/evolution.spec, evolution/evolution-nolibs.patch, evolu...
megabajt
megabajt at pld-linux.org
Fri Sep 30 00:54:32 CEST 2011
Author: megabajt Date: Thu Sep 29 22:54:32 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 3.2.0; merged from DEVEL
---- Files affected:
packages/evolution:
evolution.spec (1.296 -> 1.297) , evolution-nolibs.patch (1.2 -> 1.3) , champlain-0.12.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/evolution/evolution.spec
diff -u packages/evolution/evolution.spec:1.296 packages/evolution/evolution.spec:1.297
--- packages/evolution/evolution.spec:1.296 Sun Sep 11 11:30:47 2011
+++ packages/evolution/evolution.spec Fri Sep 30 00:54:27 2011
@@ -4,19 +4,19 @@
%bcond_without ldap # build without ldap support
%bcond_without kerberos5 # build without kerberos5 support
#
-%define basever 3.0
+%define basever 3.2
#
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: 3.0.3
-Release: 3
+Version: 3.2.0
+Release: 1
License: GPL v2+
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/evolution/3.0/%{name}-%{version}.tar.xz
-# Source0-md5: 3d0fd6ee9d20d53ad810625c385af2d5
+Source0: http://ftp.gnome.org/pub/GNOME/sources/evolution/3.2/%{name}-%{version}.tar.xz
+# Source0-md5: 7c2143fe69343158ca220903b4f4b569
Source1: %{name}-gg16.png
Source2: %{name}-gg48.png
Source3: %{name}-addressbook.desktop
@@ -25,47 +25,64 @@
Source6: %{name}-tasks.desktop
Patch0: %{name}-nolibs.patch
Patch1: %{name}-gnome-icon-theme.patch
+Patch2: champlain-0.12.patch
URL: http://www.gnome.org/projects/evolution/
BuildRequires: GConf2-devel >= 2.28.0
BuildRequires: NetworkManager-devel >= 0.7
+BuildRequires: atk-devel
BuildRequires: autoconf >= 2.58
BuildRequires: automake >= 1:1.10
BuildRequires: bison
+BuildRequires: cairo-gobject-devel
+BuildRequires: clutter-devel >= 1.0.0
+BuildRequires: clutter-gtk-devel >= 0.90
BuildRequires: docbook-dtd412-xml
-BuildRequires: evolution-data-server-devel >= 3.0.3
+BuildRequires: evolution-data-server-devel >= 3.2.0
BuildRequires: geoclue-devel >= 0.11.1
-BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.26.0
+BuildRequires: gettext-devel >= 0.18.1
+BuildRequires: glib2-devel >= 1:2.28.0
BuildRequires: gnome-common >= 2.26.0
-BuildRequires: gnome-desktop-devel >= 3.0.0
+BuildRequires: gnome-desktop-devel >= 3.2.0
BuildRequires: gnome-doc-utils >= 0.14.0
+BuildRequires: gnome-icon-theme >= 3.2.0
+BuildRequires: gnome-online-accounts-devel >= 3.2.0
+BuildRequires: gsettings-desktop-schemas-devel >= 3.2.0
BuildRequires: gstreamer-devel
-BuildRequires: gtk+3-devel >= 3.0.0
+BuildRequires: gtk+3-devel >= 3.0.2
BuildRequires: gtk-doc >= 1.9
-BuildRequires: gtkhtml-devel >= 4.0.1
-#BuildRequires: gtkimageview-devel >= 1.6
+BuildRequires: gtkhtml-devel >= 4.2.0
+#BuildRequires: gtkimageview-devel >= 2.0
%{?with_kerberos5:BuildRequires: heimdal-devel}
BuildRequires: intltool >= 0.40.0
-BuildRequires: libcanberra-gtk3-devel
-BuildRequires: libgweather-devel >= 2.28.0
-BuildRequires: libnotify-devel >= 0.4.0
+BuildRequires: libcanberra-gtk3-devel >= 0.25
+BuildRequires: libchamplain-devel >= 0.12
+BuildRequires: libgdata-devel >= 0.9
+BuildRequires: libgweather-devel >= 3.0.0
+BuildRequires: libical-devel
+BuildRequires: libnotify-devel >= 0.5.1
BuildRequires: libpst-devel >= 0.6.41
-BuildRequires: libsoup-devel >= 2.4.0
-BuildRequires: libtool
-BuildRequires: libunique3-devel >= 3.0.0
+BuildRequires: libsoup-gnome-devel >= 2.31.2
+BuildRequires: libtool >= 2.2
BuildRequires: libxml2-devel >= 1:2.7.3
+BuildRequires: libytnef-devel
+BuildRequires: mono-devel
+BuildRequires: mx-devel
BuildRequires: nspr-devel
BuildRequires: nss-devel
%{?with_ldap:BuildRequires: openldap-devel >= 2.4.6}
+BuildRequires: perl
BuildRequires: pkgconfig
BuildRequires: psmisc
BuildRequires: python
+BuildRequires: python-devel
BuildRequires: rpmbuild(find_lang) >= 1.23
-BuildRequires: rpmbuild(macros) >= 1.311
+BuildRequires: rpmbuild(macros) >= 1.527
BuildRequires: scrollkeeper >= 0.1.4
BuildRequires: shared-mime-info >= 0.22
BuildRequires: tar >= 1:1.22
BuildRequires: which
+BuildRequires: xorg-lib-libICE-devel
+BuildRequires: xorg-lib-libSM-devel
BuildRequires: xz
Requires(post,postun): gtk-update-icon-cache
Requires(post,postun): hicolor-icon-theme
@@ -74,9 +91,9 @@
Requires: %{name}-component = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
Requires: GConf2 >= 2.28.0
-Requires: evolution-data-server >= 3.0.3
-Requires: gnome-icon-theme >= 3.0.0
-Requires: gtkhtml >= 4.0.1
+Requires: evolution-data-server >= 3.2.0
+Requires: gnome-icon-theme >= 3.2.0
+Requires: gtkhtml >= 4.2.0
Requires: libical >= 0.46
Requires: psmisc
Obsoletes: evolution-pilot
@@ -106,7 +123,7 @@
Summary: Evolution libraries
Summary(pl.UTF-8): Biblioteki Evolution
Group: X11/Libraries
-Requires: glib2 >= 1:2.26.0
+Requires: glib2 >= 1:2.28.0
%description libs
This package contains Evolution libraries.
@@ -123,12 +140,11 @@
Requires: %{name}-libs = %{version}-%{release}
Requires: GConf2-devel >= 2.28.0
Requires: cyrus-sasl-devel
-Requires: evolution-data-server-devel >= 3.0.2
-Requires: glib2-devel >= 1:2.22.0
-Requires: gnome-desktop-devel >= 3.0.0
-Requires: gtk+3-devel >= 3.0
-Requires: gtkhtml-devel >= 4.0.1
-Requires: libunique3-devel >= 3.0.0
+Requires: evolution-data-server-devel >= 3.2.0
+Requires: glib2-devel >= 1:2.28.0
+Requires: gnome-desktop-devel >= 3.2.0
+Requires: gtk+3-devel >= 3.0.2
+Requires: gtkhtml-devel >= 4.2.0
Requires: libxml2-devel >= 1:2.7.3
%{?with_ldap:Requires: openldap-devel >= 2.4.6}
Obsoletes: evolution2-devel
@@ -209,6 +225,22 @@
%description calendar -l pl.UTF-8
Kalendarz i lista zadań Evolution.
+%package python
+Summary: Python embedding hooks for Evolution
+Group: X11/Applications
+Requires: %{name} = %{version}-%{release}
+
+%description python
+Python embedding hooks for Evolution.
+
+%package mono
+Summary: Mono embedding hooks for Evolution
+Group: X11/Applications
+Requires: %{name} = %{version}-%{release}
+
+%description mono
+Mono embedding hooks for Evolution.
+
%package apidocs
Summary: Evolution API documentation
Summary(pl.UTF-8): Dokumentacja API Evolution
@@ -225,6 +257,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{__gettextize}
@@ -236,31 +269,33 @@
%{__automake}
%configure \
--disable-scrollkeeper \
+ --disable-schemas-install \
+ --disable-silent-rules \
+ --enable-static \
--enable-canberra \
--enable-pst-import \
--disable-image-inline \
- --enable-contacts-map \
--enable-weather \
--enable-audio-inline \
- %{?with_ldap:--with-openldap=yes} \
- %{!?with_ldap:--with-openldap=no} \
- %{?with_kerberos5:--with-krb5=%{_prefix}} \
- %{!?with_kerberos5:--with-krb5=no} \
+ --enable-goa \
+ --with-clutter \
+ --enable-contact-maps \
+ %{__with_without ldap openldap} \
+ %{__with_without kerberos5 krb5 %{_prefix}} \
--without-static-ldap \
--with-nspr-includes="%{_includedir}/nspr" \
--with-nss-includes="%{_includedir}/nss" \
--with-nspr-libs="%{_libdir}" \
--with-nss-libs="%{_libdir}" \
--with-kde-applnk-path=no \
- --disable-schemas-install \
--enable-plugins=all \
--enable-nss=yes \
--enable-smime=yes \
- --enable-static \
--with-sub-version=" PLD Linux" \
--enable-gtk-doc \
--with-html-dir=%{_gtkdocdir} \
- --disable-silent-rules
+ --enable-python \
+ --enable-mono
%{__make}
@@ -311,7 +346,8 @@
%gconf_schema_install apps-evolution-mail-notification.schemas
%gconf_schema_install apps-evolution-template-placeholders.schemas
%gconf_schema_install apps_evolution_email_custom_header.schemas
-%gconf_schema_install bogo-junk-plugin.schemas
+%gconf_schema_install evolution-bogofilter.schemas
+%gconf_schema_install evolution-spamassassin.schemas
%gconf_schema_install evolution-mail.schemas
%update_desktop_database_post
@@ -321,7 +357,8 @@
%gconf_schema_uninstall apps-evolution-mail-notification.schemas
%gconf_schema_uninstall apps-evolution-template-placeholders.schemas
%gconf_schema_uninstall apps_evolution_email_custom_header.schemas
-%gconf_schema_uninstall bogo-junk-plugin.schemas
+%gconf_schema_uninstall evolution-bogofilter.schemas
+%gconf_schema_uninstall evolution-spamassassin.schemas
%gconf_schema_uninstall evolution-mail.schemas
%postun mail
@@ -359,6 +396,7 @@
%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/libevolution-module-plugin-lib.so
%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/libevolution-module-offline-alert.so
%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/libevolution-module-plugin-manager.so
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/libevolution-module-online-accounts.so
%{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas
@@ -392,6 +430,9 @@
%lang(sr at latin) %dir %{_datadir}/evolution/%{basever}/default/sr at latin
%lang(zh_CN) %dir %{_datadir}/evolution/%{basever}/default/zh_CN
+%{_datadir}/evolution/%{basever}/address_formats.dat
+%{_datadir}/evolution/%{basever}/countrytransl.map
+
%dir %{_datadir}/evolution/%{basever}/errors
%{_datadir}/evolution/%{basever}/errors/e-system.error
%{_datadir}/evolution/%{basever}/errors/filter.error
@@ -606,9 +647,10 @@
%{evo_plugins_dir}/org-gnome-evolution-bbdb.eplug
# bogo-junk-plugin
-%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-bogo-junk-plugin.so
-%{evo_plugins_dir}/org-gnome-bogo-junk-plugin.eplug
-%{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
+#%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-bogo-junk-plugin.so
+#%{evo_plugins_dir}/org-gnome-bogo-junk-plugin.eplug
+%{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/libevolution-module-bogofilter.so
# dbx-import
%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-dbx-import.so
@@ -624,14 +666,14 @@
#%{evo_plugins_dir}/org-gnome-image-inline.eplug
# groupwise-features
-%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-groupwise-features.so
-%{evo_plugins_dir}/org-gnome-groupwise-features.eplug
-%{evo_plugins_dir}/org-gnome-compose-send-options.xml
-%{_datadir}/evolution/%{basever}/errors/org-gnome-mail-retract.error
-%{_datadir}/evolution/%{basever}/errors/org-gnome-process-meeting.error
-%{_datadir}/evolution/%{basever}/errors/org-gnome-proxy-login.error
-%{_datadir}/evolution/%{basever}/errors/org-gnome-proxy.error
-%{_datadir}/evolution/%{basever}/errors/org-gnome-shared-folder.error
+#%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-groupwise-features.so
+#%{evo_plugins_dir}/org-gnome-groupwise-features.eplug
+#%{evo_plugins_dir}/org-gnome-compose-send-options.xml
+#%{_datadir}/evolution/%{basever}/errors/org-gnome-mail-retract.error
+#%{_datadir}/evolution/%{basever}/errors/org-gnome-process-meeting.error
+#%{_datadir}/evolution/%{basever}/errors/org-gnome-proxy-login.error
+#%{_datadir}/evolution/%{basever}/errors/org-gnome-proxy.error
+#%{_datadir}/evolution/%{basever}/errors/org-gnome-shared-folder.error
# imap-features
%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-imap-features.so
@@ -665,8 +707,10 @@
%{evo_plugins_dir}/org-gnome-pst-import.eplug
# sa-junk-plugin
-%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-sa-junk-plugin.so
-%{evo_plugins_dir}/org-gnome-sa-junk-plugin.eplug
+#%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-sa-junk-plugin.so
+#%{evo_plugins_dir}/org-gnome-sa-junk-plugin.eplug
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/libevolution-module-spamassassin.so
+%{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas
# subject-thread
#%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-subject-thread.so
@@ -752,6 +796,14 @@
%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-save-calendar.so
%{evo_plugins_dir}/org-gnome-save-calendar.eplug
+%files python
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/libevolution-module-plugin-python.so
+
+%files mono
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/libevolution-module-plugin-mono.so
+
%files apidocs
%defattr(644,root,root,755)
%{_gtkdocdir}/eshell
@@ -762,6 +814,29 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.297 2011/09/29 22:54:27 megabajt
+- updated to 3.2.0; merged from DEVEL
+
+Revision 1.296.2.6 2011/09/20 12:19:32 wiget
+- fix BR for libchamplain
+
+Revision 1.296.2.5 2011/09/20 12:19:03 wiget
+- build with libchamplain 0.12
+
+Revision 1.296.2.4 2011/09/20 09:11:11 wiget
+- BR mono-devel and python-devel (for embedding hooks)
+- BR newer rpmbuild(macros) for %{__with_without} macro
+
+Revision 1.296.2.3 2011/09/20 09:08:44 wiget
+- added python and mono subpackages
+- enable clutter
+
+Revision 1.296.2.2 2011/09/19 20:30:12 wiget
+- up to 3.1.92 (need more work)
+
+Revision 1.296.2.1 2011/09/12 08:38:50 wiget
+- up to 3.1.91
+
Revision 1.296 2011/09/11 09:30:47 arekm
- release 3
================================================================
Index: packages/evolution/evolution-nolibs.patch
diff -u packages/evolution/evolution-nolibs.patch:1.2 packages/evolution/evolution-nolibs.patch:1.3
--- packages/evolution/evolution-nolibs.patch:1.2 Fri Oct 16 17:28:57 2009
+++ packages/evolution/evolution-nolibs.patch Fri Sep 30 00:54:27 2011
@@ -1,16 +1,15 @@
-diff -urN evolution-2.28.0/m4/evo_ldap_check.m4 evolution-2.28.0.new/m4/evo_ldap_check.m4
---- evolution-2.28.0/m4/evo_ldap_check.m4 2009-08-11 13:50:27.000000000 +0200
-+++ evolution-2.28.0.new/m4/evo_ldap_check.m4 2009-10-15 15:01:56.206824013 +0200
-@@ -55,9 +55,9 @@
+--- evolution-3.1.91/m4/evo_ldap_check.m4.orig 2011-06-08 19:12:25.000000000 +0200
++++ evolution-3.1.91/m4/evo_ldap_check.m4 2011-09-12 08:22:43.075017176 +0200
+@@ -55,9 +55,9 @@ AC_DEFUN([EVO_LDAP_CHECK],[
AC_MSG_ERROR([evolution requires OpenLDAP version >= 2])
fi
-- AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"])
+- AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"], [AC_CHECK_LIB(resolv, __res_query, [LDAP_LIBS="-lresolv"])])
- AC_CHECK_LIB(socket, bind, [LDAP_LIBS="$LDAP_LIBS -lsocket"])
- AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"])
-+ dnl AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"])
-+ AC_CHECK_FUNC(bind, , [AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")])
-+ AC_CHECK_FUNC(gethostbyaddr, , [AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")])
++ dnl AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"], [AC_CHECK_LIB(resolv, __res_query, [LDAP_LIBS="-lresolv"])])
++ AC_CHECK_FUNC(bind, , [AC_CHECK_LIB(socket, bind, [LDAP_LIBS="$LDAP_LIBS -lsocket"])])
++ AC_CHECK_FUNC(gethostbyaddr, , [AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"])])
AC_CHECK_LIB(lber, ber_get_tag, [
if test "$with_static_ldap" = "yes"; then
LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
================================================================
Index: packages/evolution/champlain-0.12.patch
diff -u /dev/null packages/evolution/champlain-0.12.patch:1.2
--- /dev/null Fri Sep 30 00:54:32 2011
+++ packages/evolution/champlain-0.12.patch Fri Sep 30 00:54:27 2011
@@ -0,0 +1,37 @@
+--- evolution-3.1.92/configure.ac.wiget 2011-09-20 12:46:18.597079039 +0200
++++ evolution-3.1.92/configure.ac 2011-09-20 12:46:56.003114171 +0200
+@@ -50,7 +50,7 @@ m4_define([libpst_minimum_version], [0.6
+ m4_define([libnotify_minimum_version], [0.5.1])
+
+ dnl Optional Packages
+-m4_define([champlain_minimum_version], [0.10])
++m4_define([champlain_minimum_version], [0.12])
+ m4_define([clutter_gtk_minimum_version], [0.90])
+ m4_define([geoclue_minimum_version], [0.11.1])
+ m4_define([gladeui_minimum_version], [3.10.0])
+@@ -1500,12 +1500,12 @@ if test "x$enable_contact_maps" = "xyes"
+ AC_MSG_ERROR([Clutter is required for maps in contacts. Use --with-clutter=yes to enable clutter.])
+ fi
+
+- PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.10 >= champlain_minimum_version], [have_champlain=yes], [have_champlain=no])
++ PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.12 >= champlain_minimum_version], [have_champlain=yes], [have_champlain=no])
+ AC_SUBST(CHAMPLAIN_CFLAGS)
+ AC_SUBST(CHAMPLAIN_LIBS)
+
+ if test "x$have_champlain" = "xno"; then
+- AC_MSG_ERROR([champlain-gtk-0.10 >= champlain_minimum_version is required for maps in contacts preview.])
++ AC_MSG_ERROR([champlain-gtk-0.12 >= champlain_minimum_version is required for maps in contacts preview.])
+ fi
+
+ PKG_CHECK_MODULES([GEOCLUE], [geoclue >= geoclue_minimum_version], [have_geoclue=yes], [have_geoclue=no])
+--- evolution-3.1.92/widgets/misc/e-contact-map.c.wiget 2011-09-20 13:04:10.735525195 +0200
++++ evolution-3.1.92/widgets/misc/e-contact-map.c 2011-09-20 13:04:33.191856685 +0200
+@@ -42,7 +42,7 @@
+ #include <glib/gi18n.h>
+ #include <math.h>
+
+-G_DEFINE_TYPE (EContactMap, e_contact_map, GTK_TYPE_CHAMPLAIN_EMBED)
++G_DEFINE_TYPE (EContactMap, e_contact_map, GTK_CHAMPLAIN_TYPE_EMBED)
+
+ struct _EContactMapPrivate {
+ GHashTable *markers; /* Hash table contact-name -> marker */
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/evolution/evolution.spec?r1=1.296&r2=1.297&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/evolution/evolution-nolibs.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/evolution/champlain-0.12.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list