[evolution] Drop gnome-icon-theme dependency
Milan Crha
mcrha at fedoraproject.org
Mon Jun 9 09:36:53 UTC 2014
commit e5098bb2c6d5e195c1c0dca21b2e36c3b8f47063
Author: Milan Crha <mcrha at redhat.com>
Date: Mon Jun 9 11:36:44 2014 +0200
Drop gnome-icon-theme dependency
evolution-3.12.3-drop-gnome-icon-theme-dep.patch | 23 ++++++++++++++++++++++
evolution.spec | 8 +++---
2 files changed, 27 insertions(+), 4 deletions(-)
---
diff --git a/evolution-3.12.3-drop-gnome-icon-theme-dep.patch b/evolution-3.12.3-drop-gnome-icon-theme-dep.patch
new file mode 100644
index 0000000..f3d5f23
--- /dev/null
+++ b/evolution-3.12.3-drop-gnome-icon-theme-dep.patch
@@ -0,0 +1,23 @@
+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])
diff --git a/evolution.spec b/evolution.spec
index 01fbbe0..c507080 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -5,7 +5,6 @@
%define gtkhtml_version 4.5.2
%define gnome_desktop_version 2.91.3
%define gnome_doc_utils_version 0.8.0
-%define gnome_icon_theme_version 2.30.2.1
%define intltool_version 0.35.5
%define libgdata_version 0.10.0
%define libgweather_version 3.5.0
@@ -31,7 +30,7 @@
Name: evolution
Version: 3.12.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL
@@ -53,7 +52,6 @@ Patch02: evolution-2.30.1-help-contents.patch
## Dependencies ###
-Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
Requires: gvfs
Requires: gtkspell3
Requires: highlight
@@ -83,7 +81,6 @@ BuildRequires: pkgconfig(gdk-pixbuf-2.0)
BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version}
-BuildRequires: pkgconfig(gnome-icon-theme) >= %{gnome_icon_theme_version}
BuildRequires: pkgconfig(gsettings-desktop-schemas)
BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
BuildRequires: pkgconfig(gtkhtml-editor-4.0) >= %{gtkhtml_version}
@@ -529,6 +526,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Jun 09 2014 Milan Crha <mcrha at redhat.com> - 3.12.3-2
+- Drop gnome-icon-theme dependency
+
* Mon Jun 09 2014 Milan Crha <mcrha at redhat.com> - 3.12.3-1
- Update to 3.12.3
More information about the scm-commits
mailing list