Update to 3.12.5

This commit is contained in:
Milan Crha 2014-08-11 11:24:02 +02:00
commit 9f8dfb1e5d
4 changed files with 6 additions and 28 deletions

1
.gitignore vendored
View file

@ -76,3 +76,4 @@ evolution-2.31.5.tar.bz2
/evolution-3.12.2.tar.xz
/evolution-3.12.3.tar.xz
/evolution-3.12.4.tar.xz
/evolution-3.12.5.tar.xz

View file

@ -1,23 +0,0 @@
diff -up evolution-3.12.3/configure.ac.drop-gnome-icon-theme-dep evolution-3.12.3/configure.ac
--- evolution-3.12.3/configure.ac.drop-gnome-icon-theme-dep 2014-06-09 11:33:17.814864320 +0200
+++ evolution-3.12.3/configure.ac 2014-06-09 11:33:44.925863171 +0200
@@ -49,7 +49,6 @@ m4_define([gtkhtml_minimum_version], [4.
m4_define([gdk_pixbuf_minimum_version], [2.24.0])
m4_define([gcr_minimum_version], [3.4])
m4_define([gnome_desktop_minimum_version], [2.91.3])
-m4_define([gnome_icon_theme_minimum_version], [2.30.2.1])
m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92])
m4_define([webkitgtk_minimum_version], [2.0.1])
m4_define([libgdata_minimum_version], [0.10])
@@ -486,11 +485,6 @@ fi
AC_CHECK_FUNCS(mkdtemp)
dnl **************************************************
-dnl Gnome Icon Theme
-dnl **************************************************
-PKG_CHECK_MODULES([GIT], [gnome-icon-theme >= gnome_icon_theme_minimum_version])
-
-dnl **************************************************
dnl Accessibility support
dnl **************************************************
PKG_CHECK_MODULES([A11Y], [atk])

View file

@ -29,7 +29,7 @@
### Abstract ###
Name: evolution
Version: 3.12.4
Version: 3.12.5
Release: 1%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
@ -50,8 +50,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
# RH bug #589555
Patch02: evolution-2.30.1-help-contents.patch
Patch03: evolution-3.12.3-drop-gnome-icon-theme-dep.patch
## Dependencies ###
Requires: gvfs
@ -207,7 +205,6 @@ This package contains the plugin to import Microsoft Personal Storage Table
%setup -q -n evolution-%{version}
%patch01 -p1 -b .ldaphack
%patch02 -p1 -b .help-contents
%patch03 -p1 -b .drop-gnome-icon-theme-dep
# Remove the welcome email from Novell
for inbox in mail/default/*/Inbox; do
@ -529,6 +526,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Mon Aug 11 2014 Milan Crha <mcrha@redhat.com> - 3.12.5-1
- Update to 3.12.5
* Mon Jul 14 2014 Milan Crha <mcrha@redhat.com> - 3.12.4-1
- Update to 3.12.4
- Remove patch to fix folder names in Mail view's folder tree (fixed upstream)

View file

@ -1 +1 @@
b94b63bd8a32527aa45b152878c0a354 evolution-3.12.4.tar.xz
4cf8ad5385889cc2a701397122c11487 evolution-3.12.5.tar.xz