From 8dd83c3d0a4a08962a12623ddf7f0f9102b41f3e Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Dec 07 2005 22:07:52 +0000 Subject: - 2.5.2 - bump gtkhtml requirement from 3.7.6 to 3.9.2 - bump eds requirement from 1.4.1.1 to 1.5.2 - bump evo_major from 2.4 to 2.6 - updated patch 107 - updated patch 108 - updated patch 800, replacing rh-161817-attach-116019-conduit_pilot_link_updates.diff with evolution-2.5.2-fix-conduits.patch. Not yet complete. - disable pilot support for now (see #175160) - added hula plugin to list of packaged plugins - generalize gconf schema packaging to support changing evo_major --- diff --git a/.cvsignore b/.cvsignore index ba0cc4a..3ed44db 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.4.2.tar.bz2 +evolution-2.5.2.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 6ced160..8295111 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,8 +1,8 @@ -%define gtkhtml_version 3.7.6 +%define gtkhtml_version 3.9.2 %define soup_version 2.2.2 -%define eds_version 1.4.1.1 +%define eds_version 1.5.2 %define use_mozilla_nss 1 -%define evo_major 2.4 +%define evo_major 2.6 %define libbonoboui_version 2.4.2 %define orbit2_version 2.9.8 %define gnome_icon_theme_version 1.3.6 @@ -19,7 +19,7 @@ %ifarch s390 s390x %define pilot_support 0 %else -%define pilot_support 1 +%define pilot_support 0 %endif # note that nntp is non-functional in evo 1.3.x %define nntp_support 1 @@ -30,8 +30,8 @@ %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins Name: evolution -Version: 2.4.2 -Release: 2 +Version: 2.5.2 +Release: 1 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -79,8 +79,8 @@ Patch110: evolution-2.4.1-hide-switcher-buttons-by-default.patch # This was added upstream in 1.5.93, with configure-time detection #Patch700: evolution-1.5.9.1-filechooser.patch -# Patches for conduits by Mark G. Adams: -Patch800: rh-161817-attach-116019-conduit_pilot_link_updates.diff +# Patches for conduits, based upon rh-161817-attach-116019-conduit_pilot_link_updates.diff (the latter patch was originally by Mark G. Adams): +Patch800: evolution-2.5.2-fix-conduits.patch # Move .conduit files from share to lib (for the sake of multilib) Patch802: evolution-2.2.2-fix-conduit-dir.patch @@ -212,7 +212,7 @@ cd ../.. #patch700 -p1 -b .filechooser -%patch800 -p0 -b .fix-conduits +%patch800 -p1 -b .fix-conduits %patch802 -p1 -b .fix-conduit-dir %patch803 -p1 -b .no-gnome-common %patch804 -p1 -b .fix-missing-declarations @@ -335,7 +335,7 @@ ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution %post /sbin/ldconfig export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -SCHEMAS="apps-evolution-mail-prompts-checkdefault-2.4.schemas apps_evolution_addressbook-2.4.schemas apps_evolution_calendar-2.4.schemas apps_evolution_shell-2.4.schemas evolution-mail-2.4.schemas" +SCHEMAS="apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas apps_evolution_addressbook-%{evo_major}.schemas apps_evolution_calendar-%{evo_major}.schemas apps_evolution_shell-%{evo_major}.schemas evolution-mail-%{evo_major}.schemas" for S in $SCHEMAS; do gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null done @@ -351,11 +351,11 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}-%{evo_major}.lang %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README -%{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault-2.4.schemas -%{_sysconfdir}/gconf/schemas/apps_evolution_addressbook-2.4.schemas -%{_sysconfdir}/gconf/schemas/apps_evolution_calendar-2.4.schemas -%{_sysconfdir}/gconf/schemas/apps_evolution_shell-2.4.schemas -%{_sysconfdir}/gconf/schemas/evolution-mail-2.4.schemas +%{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas +%{_sysconfdir}/gconf/schemas/apps_evolution_addressbook-%{evo_major}.schemas +%{_sysconfdir}/gconf/schemas/apps_evolution_calendar-%{evo_major}.schemas +%{_sysconfdir}/gconf/schemas/apps_evolution_shell-%{evo_major}.schemas +%{_sysconfdir}/gconf/schemas/evolution-mail-%{evo_major}.schemas %{_bindir}/* %{_datadir}/applications/redhat-evolution-mail.desktop %{_datadir}/applications/redhat-evolution-calendar.desktop @@ -476,6 +476,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-subject-thread.eplug %{evo_plugin_dir}/liborg-gnome-subject-thread.so +%{evo_plugin_dir}/org-gnome-evolution-hula-account-setup.eplug +%{evo_plugin_dir}/liborg-gnome-evolution-hula-account-setup.so + %files devel %defattr(-, root, root) %{_includedir}/evolution-%{evo_major} @@ -483,6 +486,20 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/*.so %changelog +* Wed Dec 7 2005 David Malcolm - 2.5.2-1 +- 2.5.2 +- bump gtkhtml requirement from 3.7.6 to 3.9.2 +- bump eds requirement from 1.4.1.1 to 1.5.2 +- bump evo_major from 2.4 to 2.6 +- updated patch 107 +- updated patch 108 +- updated patch 800, replacing + rh-161817-attach-116019-conduit_pilot_link_updates.diff with + evolution-2.5.2-fix-conduits.patch. Not yet complete. +- disable pilot support for now (see #175160) +- added hula plugin to list of packaged plugins +- generalize gconf schema packaging to support changing evo_major + * Fri Dec 2 2005 David Malcolm - 2.4.2-2 - force regeneration of the intltool files to prevent a problem where the tarball copy of intltool-merge.in was out of sync with the intltool.m4 in the diff --git a/sources b/sources index 32af156..ea03c25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5c5258ec39afa8bf27c9700477807a2c evolution-2.4.2.tar.bz2 +2e7ca9a2ca5ce5d3c20a9e49c0d3cd91 evolution-2.5.2.tar.bz2