diff --git a/libreoffice.changes b/libreoffice.changes index d586b67..b37c62d 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 8 12:24:45 UTC 2015 - tchvatal@suse.com + +- Fix build on SLE12 and 13.1 by adding conditional for appdata install + ------------------------------------------------------------------- Wed Apr 8 12:03:19 UTC 2015 - dimstar@opensuse.org diff --git a/libreoffice.spec b/libreoffice.spec index 4ef92e1..aab116a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1110,11 +1110,13 @@ ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python3_sitelib} # Install appdata files, so we're shown in gnome-software (and other, future app stores) # upstream ships the files called libreoffice-{base,writer,...}, but the destop files are called base.destop [...] # fixup the appdata files internal reference to the .desktop file and rename them on the go to match the name +%if 0%{?suse_version} > 1315 install -m 0755 -d %{buildroot}%{_datadir}/appdata for appdata in base calc draw impress writer; do sed "s/libreoffice-${appdata}.desktop/${appdata}.desktop}/" \ sysui/desktop/appstream-appdata/libreoffice-${appdata}.appdata.xml > %{buildroot}%{_datadir}/appdata/%{appdata}.appdata.xml -done; +done +%endif # Remove translations source as we need more space rm -rf translations/source/ @@ -1225,26 +1227,36 @@ fi %files -f file-lists/base_list.txt base %defattr(-,root,root) +%if 0%{?suse_version} > 1315 %{_datadir}/appdata/base.appdata.xml +%endif %files -f file-lists/calc_list.txt calc %defattr(-,root,root) +%if 0%{?suse_version} > 1315 %{_datadir}/appdata/calc.appdata.xml +%endif %files -f file-lists/draw_list.txt draw %defattr(-,root,root) +%if 0%{?suse_version} > 1315 %{_datadir}/appdata/draw.appdata.xml +%endif %files -f file-lists/math_list.txt math %defattr(-,root,root) %files -f file-lists/impress_list.txt impress %defattr(-,root,root) +%if 0%{?suse_version} > 1315 %{_datadir}/appdata/impress.appdata.xml +%endif %files -f file-lists/writer_list.txt writer %defattr(-,root,root) +%if 0%{?suse_version} > 1315 %{_datadir}/appdata/writer.appdata.xml +%endif %files -f file-lists/postgresql_list.txt base-drivers-postgresql %defattr(-,root,root)