- no icon-theme is required at build time

- rel 2

diff --git a/evince.spec b/evince.spec
index 17e9ed28e9fc24d518583027704f51c040e43f91..1bc29801220288806b46c672a2de4d8ef0b8233b 100644 (file)
--- a/evince.spec
+++ b/evince.spec
@@ -11,14 +11,14 @@ Summary:    Document viewer for multiple document formats
 Summary(pl.UTF-8):     Przeglądarka dokumentów w wielu formatach
 Name:          evince
 Version:       3.14.0
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         X11/Applications/Graphics
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/evince/3.14/%{name}-%{version}.tar.xz
 # Source0-md5: feaf7382d4829a8ea52bfbaae106b9da
 Patch0:                %{name}-linking.patch
+Patch1:                icon-theme.patch
 URL:           http://www.gnome.org/projects/evince/
-BuildRequires: adwaita-icon-theme >= 2.17.1
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1:1.10
 BuildRequires: cairo-devel >= 1.10.0
@@ -223,6 +223,7 @@ Wtyczka Evince dla przegądarek WWW zgodnych z Mozillą.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__gtkdocize}

diff --git a/icon-theme.patch b/icon-theme.patch
new file mode 100644 (file)
index 0000000..58bf192
--- /dev/null
+++ b/icon-theme.patch
@@ -0,0 +1,27 @@
+--- evince-3.14.0/configure.ac~        2014-10-11 19:48:53.000000000 +0200
++++ evince-3.14.0/configure.ac 2014-10-11 19:50:09.204494246 +0200
+@@ -174,24 +174,6 @@
+ fi
+ 
+ SHELL_PLATFORM_PKGS=
+-case "$with_platform" in
+-  gnome)
+-        # Evince has a rather soft run-time dependency on hicolor-icon-theme.
+-        # If the hicolor theme is not available, Evince fails to display some
+-        # icons. Because we cannot check for it at run-time, we instead
+-        # would like to require the icon theme at compile-time. But, because
+-        # the hicolor-icon-theme does not have a pkgconfig file, on gnome we
+-        # require the gnome icon theme instead.
+-        SHELL_PLATFORM_PKGS="adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED"
+-        ;;
+-  *)
+-        # On all other platforms we issue a warning about the runtime
+-        # dependency.
+-        AC_MSG_WARN([Evince has a soft run-time dependency on hicolor-icon-theme. You are advised to have this theme installed when running Evince.]);
+-        SHELL_PLATFORM_PKGS=""
+-        ;;
+-esac
+-
+ PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS])
+ 
+ # ***************