--- cauldron/libreoffice/current/SPECS/libreoffice.spec 2015/04/07 05:08:11 819788 +++ cauldron/libreoffice/current/SPECS/libreoffice.spec 2015/04/07 05:57:35 819789 @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%define libo_version 4.4.1 +%define libo_version 4.4.2 # Should contain .alphaX / .betaX, if this is pre-release (actually # pre-RC) version. The pre-release string is part of tarball file names, # so we need a way to define it easily at one place. @@ -74,6 +74,9 @@ BuildRequires: bc BuildRequires: binutils BuildRequires: bison +%if 0%{?rhel} && 0%{?rhel} < 7 +BuildRequires: chrpath +%endif BuildRequires: desktop-file-utils BuildRequires: doxygen BuildRequires: findutils @@ -85,6 +88,7 @@ BuildRequires: make BuildRequires: perl(Archive::Zip) BuildRequires: perl(Digest::MD5) +BuildRequires: libappstream-glib-devel BuildRequires: ucpp # (tv) for xmllint: BuildRequires: libxml2-utils @@ -226,8 +230,13 @@ Patch18: 0001-radio-check-top-center-bottom-alignment-for-table-ce.patch Patch19: 0001-allow-comparing-documents-which-only-differ-by-frame.patch Patch20: 0001-Use-the-same-advanced-Ellipse-and-Rectangle-shapes-i.patch -Patch21: 0001-fix-linker-error.patch -Patch22: 0001-Resolves-rhbz-1193971-clear-hard-coded-char-props-in.patch +Patch21: 0001-add-accel.-to-switch-monitors-to-pres.-console.patch +Patch22: 0001-build-libetonyek-with-no-strict-aliasing.patch +Patch23: 0002-propagate-user-set-CFLAGS-to-build.patch +Patch24: 0001-gdk-pixbuf-xlib-2.0-gdk-pixbuf-2.0.patch +Patch25: 0001-Resolves-rhbz-1204244-group-sdb-windows-together-as-.patch +Patch26: 0001-Resolves-tdf-90256-repair-invalid-docking-positions.patch +Patch27: 0001-gnome-745909-grab-ungrab-keyboard-for-menus.patch #Mageia Patches #Patch1000: disable-tests.diff @@ -679,6 +688,21 @@ %description gdb-debug-support This package provides gdb pretty printers for package %{name}. +# Update the screenshot shown in the software center +# +# NOTE: It would be *awesome* if this file was pushed upstream. +# +# See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details. +# +appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/appdata/libreoffice-writer.appdata.xml \ + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/libreoffice-writer/a.png \ + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/libreoffice-writer/b.png +appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/appdata/libreoffice-calc.appdata.xml \ + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/libreoffice-calc/a.png +appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/appdata/libreoffice-draw.appdata.xml \ + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/libreoffice-draw/a.png +appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/appdata/libreoffice-impress.appdata.xml \ + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/libreoffice-impress/a.png %files gdb-debug-support %{_datadir}/gdb/auto-load%{baseinstdir} @@ -970,14 +994,6 @@ # apply patches git am %{patches} -# disable failing tests -%if 0%{?rhel} -sed -i -e /CppunitTest_sw_ooxmlsdrexport/d sw/Module_sw.mk -git commit -am 'disable failing tests on rhel' -%endif -sed -i -e /CppunitTest_sw_ooxmlimport/d sw/Module_sw.mk -git commit -am 'disable failing tests' - # Seeing .git dir makes some of the build tools change their behavior. # We do not want that. Note: it is still possible to use # git --git-dir=.git-rpm