[libreoffice/f15] workaround build failure in smoketestoo_native

David Tardon dtardon at fedoraproject.org
Wed Nov 30 07:53:02 UTC 2011


commit 8100715c7238e6f267039ee2091e72ee519868af
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Nov 30 08:51:16 2011 +0100

    workaround build failure in smoketestoo_native
    
    WTF has happened there? I don't see any change between 3.3.3 and 3.3.4...

 libreoffice.spec               |    5 ++++-
 smoketestoo_native-build.patch |   12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index b871111..48b99a8 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -166,6 +166,7 @@ Patch74: 0001-Fix-for-fdo-35513-avoid-crash-while-processing-incor.patch
 Patch75: 0001-let-Qt-call-XInitThreads-so-that-it-knows-it-s-been-.patch
 Patch76: gdb-pretty-printers.patch
 Patch77: 0001-gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
+Patch78: smoketestoo_native-build.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -883,6 +884,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch75 -p1 -b .let-Qt-call-XInitThreads-so-that-it-knows-it-s-been-.patch
 %patch76 -p1 -b .gdb-pretty-printers.patch
 %patch77 -p1 -b .gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
+%patch78 -p1 -b .smoketestoo_native-build.patch
 
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
@@ -2244,11 +2246,12 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/kde-open-url
 
 %changelog
-* Tue Nov 29 2011 David Tardon <dtardon at redhat.com> 1:3.3.4.1-1-UNBUILT
+* Wed Nov 30 2011 David Tardon <dtardon at redhat.com> 1:3.3.4.1-1
 - Resolves: rhbz#747356 let Qt call XInitThreads
 - new upstream version 3.3.4
 - add gdb pretty printers
 - Resolves: rhbz#757653 fix headless crash with cairo canvas
+- workaround problem in %check
 
 * Wed Oct 05 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.3.1-7
 - Resolves: CVE-2011-2713, binary .doc parsing fixes
diff --git a/smoketestoo_native-build.patch b/smoketestoo_native-build.patch
new file mode 100644
index 0000000..5d0bf4a
--- /dev/null
+++ b/smoketestoo_native-build.patch
@@ -0,0 +1,12 @@
+diff -up libreoffice-3.3.4.1/smoketestoo_native/data/makefile.mk.dt libreoffice-3.3.4.1/smoketestoo_native/data/makefile.mk
+--- libreoffice-3.3.4.1/smoketestoo_native/data/makefile.mk.dt	2011-11-30 08:42:24.046285026 +0100
++++ libreoffice-3.3.4.1/smoketestoo_native/data/makefile.mk	2011-11-30 08:42:39.481916046 +0100
+@@ -31,6 +31,8 @@ TARGET = data
+ 
+ .INCLUDE: settings.mk
+ 
++$(BIN)/smoketestdoc.sxw: $(OUT)/inc/myworld.mk
++
+ $(BIN)/smoketestdoc.sxw: $(MISC)/zip/smoketestdoc.sxw
+     $(COPY) $< $@
+ 


More information about the scm-commits mailing list