pool/libreoffice
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

- Do not install the appdata xml files twice bnc#965294

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=366
This commit is contained in:
Tomáš Chvátal
2016-02-06 12:47:25 +00:00
committed by Git OBS Bridge
parent abd6ff1bcd
commit 24de665af6
2 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libreoffice.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Feb 6 12:45:55 UTC 2016 - tchvatal@suse.com
- Do not install the appdata xml files twice bnc#965294
-------------------------------------------------------------------
Fri Jan 29 13:00:44 UTC 2016 - tchvatal@suse.com

17
libreoffice.spec
View File

@@ -1329,18 +1329,6 @@ for file in $files; do
echo "%{_libdir}/%{name}/share/autocorr/$file" >> file-lists/common_list.txt
done
# 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 %{with appdatastore}
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
echo "%{_datadir}/appdata/${appdata}.appdata.xml" >>file-lists/${appdata}_list.txt
done
%endif
# Remove pointless readmes
rm -rf %{buildroot}%{_libdir}/%{name}/readmes/
@@ -1551,26 +1539,21 @@ test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null |
%files -f file-lists/base_list.txt base
%defattr(-,root,root)
%{_datadir}/appdata/libreoffice-base.appdata.xml
%files -f file-lists/calc_list.txt calc
%defattr(-,root,root)
%{_datadir}/appdata/libreoffice-calc.appdata.xml
%files -f file-lists/draw_list.txt draw
%defattr(-,root,root)
%{_datadir}/appdata/libreoffice-draw.appdata.xml
%files -f file-lists/math_list.txt math
%defattr(-,root,root)
%files -f file-lists/impress_list.txt impress
%defattr(-,root,root)
%{_datadir}/appdata/libreoffice-impress.appdata.xml
%files -f file-lists/writer_list.txt writer
%defattr(-,root,root)
%{_datadir}/appdata/libreoffice-writer.appdata.xml
%files -f file-lists/postgresql_list.txt base-drivers-postgresql
%defattr(-,root,root)