commit e9f2caefd9db6d020df1b122f1d83b89f0b20df5
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Wed Sep 1 00:10:00 2010 +0100
Fix syntax issues with the spec so it builds, fix evince build
evince.patch | 11 +++++------
gnome-python2-desktop.spec | 7 ++++++-
2 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/evince.patch b/evince.patch
index c7ba5c8..a1f28cb 100644
--- a/evince.patch
+++ b/evince.patch
@@ -1,12 +1,11 @@
-diff -up gnome-python-desktop-2.29.92/configure.ac.evince
gnome-python-desktop-2.29.92/configure.ac
---- gnome-python-desktop-2.29.92/configure.ac.evince 2010-03-29 23:07:51.936129633 -0400
-+++ gnome-python-desktop-2.29.92/configure.ac 2010-03-29 23:08:21.580911027 -0400
-@@ -434,7 +434,7 @@ AM_CONDITIONAL(BUILD_EVOLUTION_ECAL, $bu
+--- gnome-python-desktop-2.31.1/configure.ac.orig 2010-08-31 23:18:25.793044155 +0100
++++ gnome-python-desktop-2.31.1/configure.ac 2010-08-31 23:18:46.309054179 +0100
+@@ -434,7 +434,7 @@
dnl should we build the evince module
AC_ARG_BINDING([evince],[YES])
if $build_evince; then
-- PKG_CHECK_MODULES(EVINCE, [evince-document-2.29 evince-view-2.29],
-+ PKG_CHECK_MODULES(EVINCE, [evince-document-2.30 evince-view-2.30],
+- PKG_CHECK_MODULES(EVINCE, [evince-document-2.30 evince-view-2.30],
++ PKG_CHECK_MODULES(EVINCE, [evince-document-2.32 evince-view-2.32],
build_evince=true,
build_evince=false)
if test -n "$export_dynamic"; then
diff --git a/gnome-python2-desktop.spec b/gnome-python2-desktop.spec
index 5d621f4..6ee5082 100644
--- a/gnome-python2-desktop.spec
+++ b/gnome-python2-desktop.spec
@@ -37,6 +37,7 @@ Source:
http://download.gnome.org/sources/gnome-python-desktop/2.31/gnome-python
#
https://bugzilla.gnome.org/show_bug.cgi?id=616306
Patch0: gnome-python-desktop-2.30.0-wnck-flagsfix.patch
+Patch1: evince.patch
### Dependencies ###
@@ -227,6 +228,10 @@ via Python.
%prep
%setup -q -n gnome-python-desktop-%{version}
%patch0 -p1 -b .flags
+%patch1 -p1 -b .evince
+
+libtoolize
+autoreconf
%build
%configure --enable-metacity
@@ -312,7 +317,7 @@ rm -rf
$RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/gtk-2.0/bugbuddy.*
%changelog
* Tue Aug 31 2010 Peter Robinson <pbrobinson(a)gmail.com> - 2.31.1-5
-- Fix syntax issues with the spec so it builds
+- Fix syntax issues with the spec so it builds, fix evince build
* Thu Aug 12 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.1-4
- Bring back evince, brasero and media profiles for F14