[evince] Fix configuration with ligbnome-desktop
mkasik
mkasik at fedoraproject.org
Wed Nov 19 11:32:10 UTC 2014
commit c084610eb899de7ae087972203fe40b0fbcf7a8c
Author: Marek Kasik <mkasik at redhat.com>
Date: Wed Nov 19 12:31:44 2014 +0100
Fix configuration with ligbnome-desktop
Related: #1147270
0001-Fix-configuration-with-ligbnome-desktop.patch | 27 ++++++++++++++++++++
evince.spec | 10 ++++++-
2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-configuration-with-ligbnome-desktop.patch b/0001-Fix-configuration-with-ligbnome-desktop.patch
new file mode 100644
index 0000000..35a4de4
--- /dev/null
+++ b/0001-Fix-configuration-with-ligbnome-desktop.patch
@@ -0,0 +1,27 @@
+From 6709534cdc8824459e805c120c2f74b97670b769 Mon Sep 17 00:00:00 2001
+From: Marek Kasik <mkasik at redhat.com>
+Date: Wed, 19 Nov 2014 10:53:29 +0100
+Subject: [PATCH] Fix configuration with ligbnome-desktop
+
+A typo caused fail of configuration with enabled
+support for libgnome-desktop.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index dd4bcab..0ae92b1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -313,7 +313,7 @@ if test "$enable_gnome_desktop" != "no"; then
+ PKG_CHECK_MODULES([LIBGNOME_DESKTOP], [gnome-desktop-3.0], has_libgnome_desktop=yes, has_libgnome_desktop=no)
+ else
+ PKG_CHECK_MODULES([LIBGNOME_DESKTOP], [gnome-desktop-3.0])
+- has_libgnome_desktop = yes
++ has_libgnome_desktop=yes
+ fi
+
+ if test x$has_libgnome_desktop = xyes; then
+--
+2.1.0
+
diff --git a/evince.spec b/evince.spec
index c2244d2..cd2f6e5 100644
--- a/evince.spec
+++ b/evince.spec
@@ -5,7 +5,7 @@
Name: evince
Version: 3.14.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Document viewer
License: GPLv2+ and GPLv3+ and LGPLv2+ and MIT and Afmparse
@@ -22,6 +22,9 @@ Patch1: 0001-Fix-runtime-critical-warning-when-starting-in-fullsc.patch
Patch2: 0001-Scroll-to-the-search-result-selected-by-user.patch
Patch3: 0002-Show-correct-page-when-next-search-result-requested.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1147270
+Patch4: 0001-Fix-configuration-with-ligbnome-desktop.patch
+
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk3-devel >= %{gtk3_version}
BuildRequires: poppler-glib-devel >= %{poppler_version}
@@ -135,6 +138,7 @@ This package contains the evince web browser plugin.
%patch1 -p1 -b .unref
%patch2 -p1 -b .scroll-to-search-result
%patch3 -p1 -b .scroll-to-search-result2
+%patch4 -p1 -b .libgnome-desktop
%build
./autogen.sh
@@ -268,6 +272,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null ||:
%{_libdir}/mozilla/plugins/libevbrowserplugin.so
%changelog
+* Wed Nov 19 2014 Marek Kasik <mkasik at redhat.com> - 3.14.1-7
+- Fix configuration with ligbnome-desktop
+- Related: #1147270
+
* Wed Nov 19 2014 Marek Kasik <mkasik at redhat.com> - 3.14.1-6
- Scroll to page on which is the search result selected by user
- when not in continuous mode.
More information about the scm-commits
mailing list