rpms/evolution/devel .cvsignore, 1.129, 1.130 evolution-1.4.4-ldap-x86_64-hack.patch, 1.3, 1.4 evolution.spec, 1.439, 1.440 sources, 1.129, 1.130

Milan Crha mcrha at fedoraproject.org
Mon May 3 17:38:31 UTC 2010 

Author: mcrha

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30946

Modified Files:
	.cvsignore evolution-1.4.4-ldap-x86_64-hack.patch 
	evolution.spec sources 
Log Message:
- Update to 2.31.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- .cvsignore	8 Feb 2010 11:42:34 -0000	1.129
+++ .cvsignore	3 May 2010 17:38:30 -0000	1.130
@@ -1 +1 @@
-evolution-2.29.90.tar.bz2
+evolution-2.31.1.tar.bz2

evolution-1.4.4-ldap-x86_64-hack.patch:
 configure |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: evolution-1.4.4-ldap-x86_64-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-1.4.4-ldap-x86_64-hack.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- evolution-1.4.4-ldap-x86_64-hack.patch	21 Oct 2008 19:51:19 -0000	1.3
+++ evolution-1.4.4-ldap-x86_64-hack.patch	3 May 2010 17:38:30 -0000	1.4
@@ -1,12 +1,21 @@
-diff -up evolution-2.24.1/configure.ldaphack evolution-2.24.1/configure
---- evolution-2.24.1/configure.ldaphack	2008-10-19 23:37:55.000000000 -0400
-+++ evolution-2.24.1/configure	2008-10-21 13:16:16.000000000 -0400
-@@ -28471,7 +28471,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set}
+diff -up evolution-2.31.1/configure.ldaphack evolution-2.31.1/configure
+--- evolution-2.31.1/configure.ldaphack	2010-05-03 12:43:34.000000000 +0200
++++ evolution-2.31.1/configure	2010-05-03 19:22:55.000000000 +0200
+@@ -15797,7 +15797,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set}
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
 +LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -16129,7 +16129,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set}
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
++LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -p -r1.439 -r1.440
--- evolution.spec	9 Feb 2010 19:23:15 -0000	1.439
+++ evolution.spec	3 May 2010 17:38:30 -0000	1.440
@@ -1,19 +1,19 @@
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
-%define glib2_version 2.16.0
+%define glib2_version 2.22.0
 %define gnome_desktop_version 2.26.0
 %define gnome_doc_utils_version 0.8.0
 %define gnome_icon_theme_version 2.19.91
 %define gnome_pilot_version 2.0.15
-%define gtk2_version 2.14.0
-%define gtkhtml_version 3.29.6
+%define gtk2_version 2.20.0
+%define gtkhtml_version 3.31.1
 %define intltool_version 0.35.5
 %define last_libgal2_version 2:2.5.3-2
 %define libgweather_version 2.25.4
 %define pilot_link_version 2:0.12.1
-%define soup_version 2.2.2
+%define soup_version 2.4.0
 
-%define evo_major 2.30
+%define evo_base_version 3.0
 
 %define exchange_support 1
 %define inline_audio_support 1
@@ -33,19 +33,19 @@
 %define build_conduits 1
 %endif
 
-%define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
+%define evo_plugin_dir %{_libdir}/evolution/%{evo_base_version}/plugins
 
 ### Abstract ###
 
 Name: evolution
-Version: 2.29.90
-Release: 2%{?dist}
+Version: 2.31.1
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: http://projects.gnome.org/evolution/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Source: http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}.tar.bz2
 
 Obsoletes: libgal2 <= %{last_libgal2_version}
 
@@ -73,6 +73,7 @@ Requires: evolution-data-server >= %{ver
 
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
 Requires: gnome-themes
+Requires: gvfs
 
 ### Build Dependencies ###
 
@@ -95,7 +96,6 @@ BuildRequires: gtk-doc
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
 BuildRequires: gtkimageview-devel
-BuildRequires: gvfs
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: libcanberra-devel
 BuildRequires: libgnomecanvas-devel >= 2.0
@@ -216,7 +216,6 @@ Group: Applications/Productivity
 Summary: PST importer plugin for Evolution
 Requires: %{name} = %{version}-%{release}
 Requires: libpst
-Requires: libytnef
 
 %description pst
 This package contains the plugin to import Microsoft Personal Storage Table
@@ -299,9 +298,9 @@ make %{?_smp_mflags} LIBTOOL=/usr/bin/li
 cd po
 grep -v ".*[.]desktop[.]in[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
-intltool-update --gettext-package=%{name}-%{evo_major} --pot
+intltool-update --gettext-package=%{name}-%{evo_base_version} --pot
 for p in *.po; do
-	msgmerge $p %{name}-%{evo_major}.pot > $p.out
+	msgmerge $p %{name}-%{evo_base_version}.pot > $p.out
 	msgfmt -o `basename $p .po`.gmo $p.out
 done
 cd -
@@ -350,10 +349,10 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-p
 rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys
 rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime
 
-%find_lang evolution-%{evo_major} --all-name --with-gnome
+%find_lang evolution-%{evo_base_version} --all-name --with-gnome
 
-grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang
-grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang
+grep "/usr/share/locale" evolution-%{evo_base_version}.lang > translations.lang
+grep -v "/usr/share/locale" evolution-%{evo_base_version}.lang > help.lang
 
 %pre
 if [ "$1" -gt 1 ] ; then
@@ -446,8 +445,11 @@ rm -rf $RPM_BUILD_ROOT
 # The alarm notify daemon
 %{_bindir}/evolution-alarm-notify
 
+%{_bindir}/evolution-settings
+
 # Desktop files:
 %{_datadir}/applications/evolution.desktop
+%{_datadir}/applications/evolution-settings.desktop
 %{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop
 
 # Icons:
@@ -461,42 +463,43 @@ rm -rf $RPM_BUILD_ROOT
 # The main data directory
 # (have not attempted to split this up into an explicit list)
 %dir %{_datadir}/evolution
-%{_datadir}/evolution/%{evo_major}
+%{_datadir}/evolution/%{evo_base_version}
 
 # Modules:
 %dir %{_libdir}/evolution
-%dir %{_libdir}/evolution/%{evo_major}
-%{_libdir}/evolution/%{evo_major}/modules
+%dir %{_libdir}/evolution/%{evo_base_version}
+%{_libdir}/evolution/%{evo_base_version}/modules
 
 # Shared libraries:
-%{_libdir}/evolution/%{evo_major}/libcomposer.so.*
-%{_libdir}/evolution/%{evo_major}/libeabutil.so.*
-%{_libdir}/evolution/%{evo_major}/libecontacteditor.so.*
-%{_libdir}/evolution/%{evo_major}/libecontactlisteditor.so.*
-%{_libdir}/evolution/%{evo_major}/libemformat.so.*
-%{_libdir}/evolution/%{evo_major}/libemiscwidgets.so.*
-%{_libdir}/evolution/%{evo_major}/libeshell.so.*
-%{_libdir}/evolution/%{evo_major}/libessmime.so.*
-%{_libdir}/evolution/%{evo_major}/libetable.so.*
-%{_libdir}/evolution/%{evo_major}/libetext.so.*
-%{_libdir}/evolution/%{evo_major}/libetimezonedialog.so.*
-%{_libdir}/evolution/%{evo_major}/libeutil.so.*
-%{_libdir}/evolution/%{evo_major}/libevolution-a11y.so.*
-%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-importers.so.*
-%{_libdir}/evolution/%{evo_major}/libevolution-calendar.so.*
-%{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so.*
-%{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so.*
-%{_libdir}/evolution/%{evo_major}/libevolution-mail.so.*
-%{_libdir}/evolution/%{evo_major}/libevolution-smime.so.*
-%{_libdir}/evolution/%{evo_major}/libfilter.so.*
-%{_libdir}/evolution/%{evo_major}/libmenus.so.*
+%{_libdir}/evolution/%{evo_base_version}/libcomposer.so.*
+%{_libdir}/evolution/%{evo_base_version}/libeabutil.so.*
+%{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so.*
+%{_libdir}/evolution/%{evo_base_version}/libecontactlisteditor.so.*
+%{_libdir}/evolution/%{evo_base_version}/libemformat.so.*
+%{_libdir}/evolution/%{evo_base_version}/libemiscwidgets.so.*
+%{_libdir}/evolution/%{evo_base_version}/libeshell.so.*
+%{_libdir}/evolution/%{evo_base_version}/libessmime.so.*
+%{_libdir}/evolution/%{evo_base_version}/libetable.so.*
+%{_libdir}/evolution/%{evo_base_version}/libetext.so.*
+%{_libdir}/evolution/%{evo_base_version}/libetimezonedialog.so.*
+%{_libdir}/evolution/%{evo_base_version}/libeutil.so.*
+%{_libdir}/evolution/%{evo_base_version}/libevolution-a11y.so.*
+%{_libdir}/evolution/%{evo_base_version}/libevolution-addressbook-importers.so.*
+%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar.so.*
+%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so.*
+%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so.*
+%{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so.*
+%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so.*
+%{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so.*
+%{_libdir}/evolution/%{evo_base_version}/libfilter.so.*
+%{_libdir}/evolution/%{evo_base_version}/libmenus.so.*
 
 # Various libexec programs:
 %dir %{_libexecdir}/evolution
-%dir %{_libexecdir}/evolution/%{evo_major}
-%{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export
-%{_libexecdir}/evolution/%{evo_major}/evolution-backup
-%{_libexecdir}/evolution/%{evo_major}/killev
+%dir %{_libexecdir}/evolution/%{evo_base_version}
+%{_libexecdir}/evolution/%{evo_base_version}/evolution-addressbook-export
+%{_libexecdir}/evolution/%{evo_base_version}/evolution-backup
+%{_libexecdir}/evolution/%{evo_base_version}/killev
 
 # The plugin directory:
 %dir %{evo_plugin_dir}
@@ -602,33 +605,34 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-, root, root)
 %{_datadir}/gtk-doc/html/eshell
-%{_includedir}/evolution-%{evo_major}
+%{_includedir}/evolution-%{evo_base_version}
 %{_libdir}/pkgconfig/evolution-calendar.pc
 %{_libdir}/pkgconfig/evolution-mail.pc
 %{_libdir}/pkgconfig/evolution-plugin.pc
 %{_libdir}/pkgconfig/evolution-shell.pc
-%{_libdir}/evolution/%{evo_major}/libcomposer.so
-%{_libdir}/evolution/%{evo_major}/libeabutil.so
-%{_libdir}/evolution/%{evo_major}/libeconduit.so
-%{_libdir}/evolution/%{evo_major}/libecontacteditor.so
-%{_libdir}/evolution/%{evo_major}/libecontactlisteditor.so
-%{_libdir}/evolution/%{evo_major}/libemformat.so
-%{_libdir}/evolution/%{evo_major}/libemiscwidgets.so
-%{_libdir}/evolution/%{evo_major}/libeshell.so
-%{_libdir}/evolution/%{evo_major}/libessmime.so
-%{_libdir}/evolution/%{evo_major}/libetable.so
-%{_libdir}/evolution/%{evo_major}/libetext.so
-%{_libdir}/evolution/%{evo_major}/libetimezonedialog.so
-%{_libdir}/evolution/%{evo_major}/libeutil.so
-%{_libdir}/evolution/%{evo_major}/libevolution-a11y.so
-%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-importers.so
-%{_libdir}/evolution/%{evo_major}/libevolution-calendar.so
-%{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so
-%{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so
-%{_libdir}/evolution/%{evo_major}/libevolution-mail.so
-%{_libdir}/evolution/%{evo_major}/libevolution-smime.so
-%{_libdir}/evolution/%{evo_major}/libfilter.so
-%{_libdir}/evolution/%{evo_major}/libmenus.so
+%{_libdir}/evolution/%{evo_base_version}/libcomposer.so
+%{_libdir}/evolution/%{evo_base_version}/libeabutil.so
+%{_libdir}/evolution/%{evo_base_version}/libeconduit.so
+%{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so
+%{_libdir}/evolution/%{evo_base_version}/libecontactlisteditor.so
+%{_libdir}/evolution/%{evo_base_version}/libemformat.so
+%{_libdir}/evolution/%{evo_base_version}/libemiscwidgets.so
+%{_libdir}/evolution/%{evo_base_version}/libeshell.so
+%{_libdir}/evolution/%{evo_base_version}/libessmime.so
+%{_libdir}/evolution/%{evo_base_version}/libetable.so
+%{_libdir}/evolution/%{evo_base_version}/libetext.so
+%{_libdir}/evolution/%{evo_base_version}/libetimezonedialog.so
+%{_libdir}/evolution/%{evo_base_version}/libeutil.so
+%{_libdir}/evolution/%{evo_base_version}/libevolution-a11y.so
+%{_libdir}/evolution/%{evo_base_version}/libevolution-addressbook-importers.so
+%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar.so
+%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so
+%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so
+%{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so
+%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so
+%{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so
+%{_libdir}/evolution/%{evo_base_version}/libfilter.so
+%{_libdir}/evolution/%{evo_base_version}/libmenus.so
 
 %files help -f help.lang
 %defattr(-, root, root)
@@ -637,13 +641,13 @@ rm -rf $RPM_BUILD_ROOT
 %if %{build_conduits}
 %files conduits
 %defattr(-, root, root)
-%dir %{_libdir}/evolution/%{evo_major}/conduits
-%{_libdir}/evolution/%{evo_major}/libeconduit.so.*
-%{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so
-%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_common_conduit.so
-%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so
-%{_libdir}/evolution/%{evo_major}/conduits/libememo_conduit.so
-%{_libdir}/evolution/%{evo_major}/conduits/libetodo_conduit.so
+%dir %{_libdir}/evolution/%{evo_base_version}/conduits
+%{_libdir}/evolution/%{evo_base_version}/libeconduit.so.*
+%{_libdir}/evolution/%{evo_base_version}/conduits/libeaddress_conduit.so
+%{_libdir}/evolution/%{evo_base_version}/conduits/libecalendar_common_conduit.so
+%{_libdir}/evolution/%{evo_base_version}/conduits/libecalendar_conduit.so
+%{_libdir}/evolution/%{evo_base_version}/conduits/libememo_conduit.so
+%{_libdir}/evolution/%{evo_base_version}/conduits/libetodo_conduit.so
 %{_libdir}/gnome-pilot/conduits/e-address.conduit
 %{_libdir}/gnome-pilot/conduits/e-calendar.conduit
 %{_libdir}/gnome-pilot/conduits/e-memo.conduit
@@ -663,8 +667,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files perl
 %defattr(-, root, root)
-%{_libexecdir}/evolution/%{evo_major}/csv2vcard
-%{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
+%{_libexecdir}/evolution/%{evo_base_version}/csv2vcard
+%{_libexecdir}/evolution/%{evo_base_version}/evolution-addressbook-clean
 
 %if %{libpst_support}
 %files pst
@@ -674,6 +678,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon May 03 2010 Milan Crha <mcrha at redhat.com> - 2.31.1-1.fc14
+- Update to 2.31.1
+
 * Tue Feb 09 2010 Milan Crha <mcrha at redhat.com> - 2.29.90-2.fc13
 - Rebuild against evolution-data-server-2.29.90-3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- sources	8 Feb 2010 11:42:34 -0000	1.129
+++ sources	3 May 2010 17:38:31 -0000	1.130
@@ -1 +1 @@
-bc62be6f295eef36da32ccbf28cc03da  evolution-2.29.90.tar.bz2
+e71e4310e4c6566d3b244b15238ac35c  evolution-2.31.1.tar.bz2

More information about the scm-commits mailing list