rpm/libreoffice
SHA256
1
0
Fork 0
forked from pool/libreoffice
Code Pull Requests Activity

Accepting request 913015 from LibreOffice:7.1

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/913015
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=977
This commit is contained in:
Markéta Machová 2021-08-19 07:38:38 +00:00 committed by Git OBS Bridge
parent 4fcbed5a10
commit c872209574
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libreoffice.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Aug 17 15:18:30 UTC 2021 - Markéta Machová <mmachova@suse.com>
- Keep upstream desktop file names (bsc#1183655) and display math icon (bsc#1180479)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 29 13:27:48 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org> Thu Jul 29 13:27:48 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>

21
libreoffice.spec
View File

@ -1192,19 +1192,14 @@ cd %{buildroot}%{_datadir}/applications
for desktop in * ; do for desktop in * ; do
# relative link is needed by %%suse_update_desktop_file # relative link is needed by %%suse_update_desktop_file
relative_target=`readlink $desktop | sed "s|%{_libdir}|../../%{_lib}|"` relative_target=`readlink $desktop | sed "s|%{_libdir}|../../%{_lib}|"`
# FIXME: remove the libreoffice- prefix because the old desktop files are preferred in %{_sysconfdir}/gnome_defaults.conf # create the link
desktop_new=`echo $desktop | sed -e "s/%{name}-//"` ln -sf $relative_target $desktop
rm $desktop
sed -i -e "s|%{_datadir}/applications/$desktop|%{_datadir}/applications/$desktop_new|" $builddir/file-lists/*.txt
# finally, create the right link
ln -sf $relative_target $desktop_new
# enable startup notification (bnc#796875) # enable startup notification (bnc#796875)
grep -q "NoDisplay=true" $desktop_new || sed -i "s/\(\[Desktop Entry\]\)/\1\nStartupNotify=true/" $desktop_new grep -q "NoDisplay=true" $desktop || sed -i "s/\(\[Desktop Entry\]\)/\1\nStartupNotify=true/" $desktop
# suse_update # suse_update
app=`echo $desktop_new | sed "s/.desktop//"` app=`echo $desktop | sed "s/.desktop//"`
%suse_update_desktop_file $app %suse_update_desktop_file $app
done done
sed -i -e 's:NoDisplay=false:NoDisplay=true:g' %{buildroot}/%{_datadir}/applications/math.desktop
cd - cd -
################ ################
# compat stuff for noarch packages # compat stuff for noarch packages
@ -1302,17 +1297,13 @@ done
rm -r %{buildroot}%{_datadir}/libreoffice/share/autotext/sr/ rm -r %{buildroot}%{_datadir}/libreoffice/share/autotext/sr/
# Install appdata files, so we're shown in gnome-software (and other, future app stores) # 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
install -m 0755 -d %{buildroot}%{_datadir}/metainfo install -m 0755 -d %{buildroot}%{_datadir}/metainfo
for appdata in base calc draw impress writer; do for appdata in base calc draw impress writer; do
sed "s/libreoffice-${appdata}.desktop/${appdata}.desktop/" \ cp sysui/desktop/appstream-appdata/libreoffice-${appdata}.appdata.xml %{buildroot}%{_datadir}/metainfo/libreoffice-${appdata}.appdata.xml
sysui/desktop/appstream-appdata/libreoffice-${appdata}.appdata.xml > %{buildroot}%{_datadir}/metainfo/${appdata}.appdata.xml echo "%{_datadir}/metainfo/libreoffice-${appdata}.appdata.xml" >>file-lists/${appdata}_list.txt
echo "%{_datadir}/metainfo/${appdata}.appdata.xml" >>file-lists/${appdata}_list.txt
%if 0%{?suse_version} < 1320 %if 0%{?suse_version} < 1320
echo "%dir %{_datadir}/metainfo/" >>file-lists/${appdata}_list.txt echo "%dir %{_datadir}/metainfo/" >>file-lists/${appdata}_list.txt
%endif %endif
rm -rf %{buildroot}%{_datadir}/metainfo/libreoffice-${appdata}.appdata.xml
done done
%if %{with kdeintegration} %if %{with kdeintegration}
echo "%{_datadir}/metainfo/org.libreoffice.kde.metainfo.xml" >>file-lists/kde4_list.txt echo "%{_datadir}/metainfo/org.libreoffice.kde.metainfo.xml" >>file-lists/kde4_list.txt