Accepting request 82149 from GNOME:Factory

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

OBS-URL: https://build.opensuse.org/request/show/82149
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/orca?expand=0&rev=73

orca-fix-doc-figures.patch

@@ -0,0 +1,51 @@
+commit 6d1f94e54536ac8944adfd684568785483b6c4a5
+Author: Vincent Untz <vuntz@gnome.org>
+Date:   Wed Sep 14 22:37:29 2011 +0200
+
+    build: Do not reference non-existing doc figures
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=659092
+
+diff --git a/help/Makefile.am b/help/Makefile.am
+index 30d1acb..48c21fb 100644
+--- a/help/Makefile.am
++++ b/help/Makefile.am
+@@ -7,20 +7,14 @@ DOC_FIGURES = \
+ 	figures/orca-logo.png \
+ 	figures/perferences_table_navigation.png \
+ 	figures/preferences_abbreviated_role_names.png \
+-	figures/preferences_advanced_button.png \
+-	figures/preferences_border.png \
+ 	figures/preferences_braille_contracted.png \
+ 	figures/preferences_braille_indicators.png \
+ 	figures/preferences_braille_verbosity.png \
+ 	figures/preferences_break_speech_into_chunks.png \
+ 	figures/preferences_character_echo.png \
+ 	figures/preferences_chat.png \
+-	figures/preferences_color.png \
+-	figures/preferences_cross-hair.png \
+-	figures/preferences_cursor.png \
+ 	figures/preferences_date_and_time.png \
+ 	figures/preferences_disable_eol_symbol.png \
+-	figures/preferences_disable_gksu_keyboard_grab.png \
+ 	figures/preferences_enable_braille_monitor.png \
+ 	figures/preferences_enable_braille_support.png \
+ 	figures/preferences_enable_speech.png \
+@@ -43,17 +37,14 @@ DOC_FIGURES = \
+ 	figures/preferences_speak_multicase_strings_as_words.png \
+ 	figures/preferences_speak_object_under_mouse.png \
+ 	figures/preferences_speech_verbosity.png \
+-	figures/preferences_start_Orca_when_you_login.png \
+ 	figures/preferences_system_voice_options.png \
+ 	figures/preferences_table_navigation.png \
+ 	figures/preferences_table_rows.png \
+ 	figures/preferences_text_attributes_braille.png \
+ 	figures/preferences_text_attributes_rearranging.png \
+ 	figures/preferences_text_attributes_table.png \
+-	figures/preferences_tracking_and_alignment.png \
+ 	figures/preferences_tts_options.png \
+ 	figures/preferences_word_and_sentence_echo.png \
+-	figures/preferences_zoomer.png \
+ 	figures/profiles_conflict.png \
+ 	figures/profiles_load.png \
+ 	figures/profiles_save_as.png

orca.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Sep 14 20:42:11 UTC 2011 - vuntz@opensuse.org
+
+- Add orca-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 gnome-autogen.sh,
+  needed for the patch above.
+
 -------------------------------------------------------------------
 Tue Sep  6 06:14:43 UTC 2011 - vuntz@opensuse.org
 

orca.spec

@@ -25,8 +25,12 @@ Summary:        Screen reader for GNOME
 Url:            http://www.gnome.org/
 Group:          System/GUI/GNOME
 Source:         http://download.gnome.org/sources/orca/3.1/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM orca-fix-doc-figures.patch bgo#659092 vuntz@opensuse.org -- Fix build system to not install non-existing figures
+Patch0:         orca-fix-doc-figures.patch
 BuildRequires:  dbus-1-python
 BuildRequires:  fdupes
+# needed by patch0
+BuildRequires:  gnome-common
 BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  intltool
 BuildRequires:  liblouis-devel
@@ -68,8 +72,11 @@ combinations of speech, braille, and/or magnification.
 %prep
 %setup -q
 translation-update-upstream
+%patch0 -p1
 
 %build
+# needed by patch0
+NOCONFIGURE=1 gnome-autogen.sh
 %configure
 make %{?_smp_mflags}