caolanm pushed to libreoffice (f22). "appstream-util not available under rhel-7"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu May 7 12:38:35 UTC 2015


From 8f14be74b6e05c9395a018076f9d5e967eaad4c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
Date: Thu, 7 May 2015 13:38:26 +0100
Subject: appstream-util not available under rhel-7


diff --git a/libreoffice.spec b/libreoffice.spec
index 48d01a1..ccc93f2 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1565,6 +1565,7 @@ done
 export DESTDIR=%{buildroot}
 make cmd cmd="install-gdb-printers -a %{_datadir}/gdb/auto-load%{baseinstdir} -c -i %{baseinstdir} -p %{_datadir}/libreoffice/gdb"
 
+%if 0%{?fedora}
 # Update the screenshot shown in the software center
 #
 # NOTE: It would be *awesome* if this file was pushed upstream.
@@ -1580,6 +1581,7 @@ appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/appdata/libreoffic
   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 
+%endif
 
 %check
 unset WITH_LANG
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?h=f22&id=8f14be74b6e05c9395a018076f9d5e967eaad4c3


More information about the scm-commits mailing list