Accepting request 82150 from home:vuntz:branches:GNOME:Factory

Fix bundle-lang-gnome build; part 2 of 3

OBS-URL: https://build.opensuse.org/request/show/82150
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/eog?expand=0&rev=105

eog-fix-doc-figures.patch

@@ -0,0 +1,25 @@
+commit d7526fe85b71b7de82d7c7a5404abbd7251c2a27
+Author: Vincent Untz <vuntz@gnome.org>
+Date:   Wed Sep 14 22:37:57 2011 +0200
+
+    build: Update list of doc figures
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=659093
+
+diff --git a/help/Makefile.am b/help/Makefile.am
+index 9221352..b52905e 100644
+--- a/help/Makefile.am
++++ b/help/Makefile.am
+@@ -5,12 +5,6 @@ DOC_ID = eog
+ DOC_INCLUDES = legal.xml
+ 
+ DOC_FIGURES = \
+-	figures/eog-bestfit.png			\
+-	figures/eog-enlarge.png			\
+-	figures/eog-normalsize.png		\
+-	figures/eog.png				\
+-	figures/eog-shrink.png			\
+-	figures/eog-toolbar-default.png		\
+ 	figures/eog-toolbar-editor.png		\
+ 	figures/image-view-prefs.png		\
+ 	figures/multiple-convert.png		\

eog.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Sep 14 20:41:29 UTC 2011 - vuntz@opensuse.org
+
+- Add eog-fix-doc-figures.patch: fix installation of doc figures so
+  we don't install non-existing figures, that would result in
+  broken links -- those will break the build of bundle-lang-gnome.
+- Add gnome-common BuildRequires and call to autoreconf, needed for
+  the patch above.
+
 -------------------------------------------------------------------
 Tue Sep  6 10:35:10 UTC 2011 - vuntz@opensuse.org
 

eog.spec

@@ -26,7 +26,11 @@ Summary:        Image Viewer for GNOME
 Url:            http://www.gnome.org/
 Group:          Productivity/Graphics/Viewers
 Source:         http://download.gnome.org/sources/eog/3.1/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM eog-fix-doc-figures.patch bgo#659093 vuntz@opensuse.org -- Fix build system to not install non-existing figures
+Patch0:         eog-fix-doc-figures.patch
 BuildRequires:  fdupes
+# needed for patch0
+BuildRequires:  gnome-common
 BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  intltool
 BuildRequires:  libexempi-devel
@@ -69,8 +73,11 @@ functional image viewer.
 %prep
 %setup -q
 translation-update-upstream
+%patch0 -p1
 
 %build
+# needed for patch0
+autoreconf -fi
 %configure\
 	--disable-scrollkeeper
 make %{?jobs:-j%jobs}