Author: lisu Date: Wed Apr 6 11:37:39 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 3.0.0, merged with DEVEL
---- Files affected: packages/evolution: evolution.spec (1.285 -> 1.286) ---- Diffs: ================================================================ Index: packages/evolution/evolution.spec diff -u packages/evolution/evolution.spec:1.285 packages/evolution/evolution.spec:1.286 --- packages/evolution/evolution.spec:1.285 Wed Feb 23 18:54:59 2011 +++ packages/evolution/evolution.spec Wed Apr 6 13:37:34 2011 @@ -4,19 +4,19 @@ %bcond_without ldap # build without ldap support %bcond_without kerberos5 # build without kerberos5 support # -%define basever 2.32 +%define basever 3.0 # 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.32.2 -Release: 2 +Version: 3.0.0 +Release: 0.1 License: GPL v2+ Group: X11/Applications -Source0: http://ftp.gnome.org/pub/GNOME/sources/evolution/2.32/%{name}-%{version}.tar.bz2 -# Source0-md5: 9bdf73b69f90ca87e4b66a9c7f871325 +Source0: http://ftp.gnome.org/pub/GNOME/sources/evolution/3.0/%{name}-%{version}.tar.bz2 +# Source0-md5: 1ba663469e9d9bd6ed93b4b5960c939f Source1: %{name}-gg16.png Source2: %{name}-gg48.png Source3: %{name}-addressbook.desktop @@ -25,7 +25,7 @@ Source6: %{name}-tasks.desktop Patch0: %{name}-nolibs.patch Patch1: %{name}-gnome-icon-theme.patch -Patch2: gtk224.patch +#Patch2: %{name}-message-send-crash.patch URL: http://www.gnome.org/projects/evolution/ BuildRequires: GConf2-devel >= 2.28.0 BuildRequires: NetworkManager-devel >= 0.7 @@ -33,27 +33,27 @@ BuildRequires: automake >= 1:1.10 BuildRequires: bison BuildRequires: docbook-dtd412-xml -BuildRequires: evolution-data-server-devel >= 2.32.1 +BuildRequires: evolution-data-server-devel >= 3.0.0 BuildRequires: geoclue-devel >= 0.11.1 BuildRequires: gettext-devel BuildRequires: glib2-devel >= 1:2.26.0 BuildRequires: gnome-common >= 2.26.0 -BuildRequires: gnome-desktop-devel >= 2.28.0 +BuildRequires: gnome-desktop-devel >= 3.0.0 BuildRequires: gnome-doc-utils >= 0.14.0 BuildRequires: gstreamer-devel -BuildRequires: gtk+2-devel >= 2:2.20.0 +BuildRequires: gtk+3-devel >= 3.0.0 BuildRequires: gtk-doc >= 1.9 -BuildRequires: gtkhtml-devel >= 3.32.1 -BuildRequires: gtkimageview-devel >= 1.6 +BuildRequires: gtkhtml-devel >= 4.0.0 +#BuildRequires: gtkimageview-devel >= 1.6 %{?with_kerberos5:BuildRequires: heimdal-devel} BuildRequires: intltool >= 0.40.0 -BuildRequires: libcanberra-gtk-devel +BuildRequires: libcanberra-gtk3-devel BuildRequires: libgweather-devel >= 2.28.0 BuildRequires: libnotify-devel >= 0.4.0 BuildRequires: libpst-devel >= 0.6.41 BuildRequires: libsoup-devel >= 2.4.0 BuildRequires: libtool -BuildRequires: libunique-devel >= 1.1.2 +BuildRequires: libunique3-devel >= 3.0.0 BuildRequires: libxml2-devel >= 1:2.7.3 BuildRequires: nspr-devel BuildRequires: nss-devel @@ -66,15 +66,15 @@ BuildRequires: scrollkeeper >= 0.1.4 BuildRequires: shared-mime-info >= 0.22 BuildRequires: which -Requires(post,postun): gtk-update-icon-cache +Requires(post,postun): gtk+3 Requires(post,postun): hicolor-icon-theme Requires(post,postun): scrollkeeper Requires(post,preun): GConf2 Requires: %{name}-component = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} Requires: GConf2 >= 2.28.0 -Requires: evolution-data-server >= 2.32.1 -Requires: gtkhtml >= 3.32.1 +Requires: evolution-data-server >= 3.0.0 +Requires: gtkhtml >= 4.0.0 Requires: libical >= 0.46 Requires: psmisc Obsoletes: evolution-pilot @@ -121,12 +121,12 @@ Requires: %{name}-libs = %{version}-%{release} Requires: GConf2-devel >= 2.28.0 Requires: cyrus-sasl-devel -Requires: evolution-data-server-devel >= 2.32.1 +Requires: evolution-data-server-devel >= 3.0.0 Requires: glib2-devel >= 1:2.22.0 -Requires: gnome-desktop-devel >= 2.28.0 -Requires: gtk+2-devel >= 2:2.20.0 -Requires: gtkhtml-devel >= 3.32.1 -Requires: libunique-devel >= 1.1.2 +Requires: gnome-desktop-devel >= 3.0.0 +Requires: gtk+3-devel >= 3.0 +Requires: gtkhtml-devel >= 4.0.0 +Requires: libunique3-devel >= 3.0.0 Requires: libxml2-devel >= 1:2.7.3 %{?with_ldap:Requires: openldap-devel >= 2.4.6} Obsoletes: evolution2-devel @@ -221,10 +221,13 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 +#patch2 -p1 + +%{__sed} -i -e 's/^en@shaw//' po/LINGUAS +%{__rm} -f po/[email protected] %build -%{__glib_gettextize} +%{__gettextize} %{__intltoolize} %{__libtoolize} %{__aclocal} -I m4 @@ -233,6 +236,13 @@ %{__automake} %configure \ --disable-scrollkeeper \ + --enable-gtk3 \ + --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}} \ @@ -269,13 +279,9 @@ install %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} $RPM_BUILD_ROOT%{_desktopdir} # remove useless files -rm -f $RPM_BUILD_ROOT%{_libdir}/evolution/*/*/*.{a,la} -rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info -rm -r $RPM_BUILD_ROOT%{_desktopdir}/evolution.desktop - -# test plugins -rm -f $RPM_BUILD_ROOT%{evo_plugins_dir}/*org-gnome-prefer-plain.{so,eplug} - +%{__rm} $RPM_BUILD_ROOT%{_libdir}/evolution/*/*/*.{a,la} +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/mime-info +%{__rm} $RPM_BUILD_ROOT%{_desktopdir}/evolution.desktop %{__rm} $RPM_BUILD_ROOT%{_libdir}/evolution/%{basever}/*.la %find_lang %{name} --all-name --with-omf --with-gnome @@ -285,11 +291,13 @@ %post %gconf_schema_install apps_evolution_shell.schemas +%gconf_schema_install apps_evolution_eplugin_face.schemas %scrollkeeper_update_post %update_icon_cache hicolor %preun %gconf_schema_uninstall apps_evolution_shell.schemas +%gconf_schema_uninstall apps_evolution_eplugin_face.schemas %postun %scrollkeeper_update_postun @@ -342,6 +350,9 @@ %attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/libevolution-module-composer-autosave.so %attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/libevolution-module-network-manager.so %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 + %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas @@ -379,6 +390,7 @@ %{_datadir}/evolution/%{basever}/errors/filter.error %{_datadir}/evolution/%{basever}/errors/mail-composer.error %{_datadir}/evolution/%{basever}/errors/shell.error +%{_datadir}/evolution/%{basever}/errors/evolution-offline-alert.error %dir %{_datadir}/evolution/%{basever}/help %dir %{_datadir}/evolution/%{basever}/help/quickref @@ -429,15 +441,24 @@ %{evo_plugins_dir}/org-gnome-default-source.eplug # plugin-manager -%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-plugin-manager.so -%{evo_plugins_dir}/org-gnome-plugin-manager.eplug +#%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-plugin-manager.so +#%{evo_plugins_dir}/org-gnome-plugin-manager.eplug + +# prefer-plain +%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-prefer-plain.so +%{evo_plugins_dir}/org-gnome-prefer-plain.eplug + +# face plugin +%{_sysconfdir}/gconf/schemas/apps_evolution_eplugin_face.schemas +%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-face.so +%{evo_plugins_dir}/org-gnome-face.eplug +%{_datadir}/evolution/%{basever}/errors/org-gnome-face.error %files libs %defattr(644,root,root,755) %dir %{_libdir}/evolution %dir %{_libdir}/evolution/%{basever} %dir %{evo_plugins_dir} -%attr(755,root,root) %{_libdir}/evolution/%{basever}/libart_lgpl.so.* %attr(755,root,root) %{_libdir}/evolution/%{basever}/libcomposer.so.* %attr(755,root,root) %{_libdir}/evolution/%{basever}/libeabutil.so.* %attr(755,root,root) %{_libdir}/evolution/%{basever}/libecontacteditor.so.* @@ -464,7 +485,6 @@ %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/evolution/%{basever}/libart_lgpl.so %attr(755,root,root) %{_libdir}/evolution/%{basever}/libcomposer.so %attr(755,root,root) %{_libdir}/evolution/%{basever}/libeabutil.so %attr(755,root,root) %{_libdir}/evolution/%{basever}/libecontacteditor.so @@ -489,14 +509,14 @@ %attr(755,root,root) %{_libdir}/evolution/%{basever}/libgnomecanvas.so %attr(755,root,root) %{_libdir}/evolution/%{basever}/libmenus.so %{_includedir}/%{name}-%{basever} -%{_pkgconfigdir}/evolution-calendar.pc -%{_pkgconfigdir}/evolution-mail.pc -%{_pkgconfigdir}/evolution-plugin.pc -%{_pkgconfigdir}/evolution-shell.pc +%{_pkgconfigdir}/evolution-calendar-3.0.pc +%{_pkgconfigdir}/evolution-mail-3.0.pc +%{_pkgconfigdir}/evolution-plugin-3.0.pc +%{_pkgconfigdir}/evolution-shell-3.0.pc %files static %defattr(644,root,root,755) -%{_libdir}/evolution/%{basever}/libart_lgpl.a +#%{_libdir}/evolution/%{basever}/libart_lgpl.a %{_libdir}/evolution/%{basever}/libcomposer.a %{_libdir}/evolution/%{basever}/libeabutil.a %{_libdir}/evolution/%{basever}/libecontacteditor.a @@ -593,8 +613,8 @@ %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas # image-inline -%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-image-inline.so -%{evo_plugins_dir}/org-gnome-image-inline.eplug +#%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-image-inline.so +#%{evo_plugins_dir}/org-gnome-image-inline.eplug # groupwise-features %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-groupwise-features.so @@ -642,8 +662,8 @@ %{evo_plugins_dir}/org-gnome-sa-junk-plugin.eplug # subject-thread -%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-subject-thread.so -%{evo_plugins_dir}/org-gnome-subject-thread.eplug +#%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-subject-thread.so +#%{evo_plugins_dir}/org-gnome-subject-thread.eplug # templates %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-templates.so @@ -735,6 +755,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.286 2011/04/06 11:37:34 lisu +- up to 3.0.0, merged with DEVEL + Revision 1.285 2011/02/23 17:54:59 megabajt - drop libtool files - release 2 @@ -754,6 +777,39 @@ Revision 1.280 2010/11/16 21:52:39 megabajt - updated to 2.32.1 - removed obsolete -message-send-crash.patch + +Revision 1.279.2.10 2011/03/29 22:55:35 wiget +- drop libtool files + +Revision 1.279.2.9 2011/03/29 09:32:33 lisu +- gnome-desktop3-devel -> gnome-desktop-devel in -devel package + +Revision 1.279.2.8 2011/03/29 09:29:02 lisu +- gnome-desktop3-devel -> gnome-desktop-devel +- sorted Os + +Revision 1.279.2.7 2011/03/25 22:48:10 patrys +- gnome-desktop3? + +Revision 1.279.2.6 2011/03/24 10:08:41 wiget +- one more libunique3 rename + +Revision 1.279.2.5 2011/03/24 10:06:55 wiget +- BR: libunique3-devel + +Revision 1.279.2.4 2011/03/22 12:58:59 wiget +- up to 2.91.92 + +Revision 1.279.2.3 2011/03/15 16:16:58 wiget +- package face plugin + +Revision 1.279.2.2 2011/03/15 12:08:22 lisu +- up to 2.91.91 +- updated deps +- __rm macros, drop obsoleted ones + +Revision 1.279.2.1 2011/02/13 03:24:13 wiget +- start update to 2.91.6.2 Revision 1.279 2010/10/20 14:02:29 megabajt - added -message-send-crash.patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/evolution/evolution.spec?r1=1.285&r2=1.286&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
