Djam/libreoffice
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/libreoffice.git synced 2025-02-23 10:32:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix ownership of %%{ooodir}/share/xdg: it must not be owned by multiple packages

Browse source
This commit is contained in:
Mikhail Novosyolov 2019-10-18 13:26:15 +03:00
parent f743588052
commit ea13c843fe
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libreoffice.spec
View file

@ -324,7 +324,6 @@ packages:
%files base -f file-lists/base_list.txt
%{_mandir}/man1/lobase*
%{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-base_72.svg
%dir %{ooodir}/share/xdg
%{ooodir}/share/xdg/base.desktop
%{_datadir}/appdata/libreoffice-base.appdata.xml
@ -341,7 +340,6 @@ This package contains the spreadsheet component for LibreOffice.
%files calc -f file-lists/calc_list.txt
%{_mandir}/man1/localc*
%{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-calc_72.svg
%dir %{ooodir}/share/xdg
%{ooodir}/share/xdg/calc.desktop
%{_datadir}/appdata/libreoffice-calc.appdata.xml
@ -439,6 +437,8 @@ This package contains the application-independent files of LibreOffice.
%{_libdir}/libreoffice/program/services/scriptproviderforbeanshell.rdb
%{ooodir}/share/gallery/sg24.*
%{ooodir}/share/libreofficekit
%dir %{ooodir}/share/xdg
%exclude %{ooodir}/share/xdg/*.desktop
%{_datadir}/appdata/org.libreoffice.kde.metainfo.xml
#----------------------------------------------------------------------------
@ -513,7 +513,6 @@ This package contains the drawing component for LibreOffice.
%files draw -f file-lists/draw_list.txt
%{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-draw_72.svg
%{_mandir}/man1/lodraw*
%dir %{ooodir}/share/xdg
%{ooodir}/share/xdg/draw.desktop
%{_datadir}/appdata/libreoffice-draw.appdata.xml
@ -577,7 +576,6 @@ This package contains the presentation component for LibreOffice.
%files impress -f file-lists/impress_list.txt
%{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-impress_72.svg
%{_mandir}/man1/loimpress*
%dir %{ooodir}/share/xdg
%{ooodir}/share/xdg/impress.desktop
%{_datadir}/appdata/libreoffice-impress.appdata.xml
@ -594,7 +592,6 @@ This package contains the equation editor component for LibreOffice.
%files math -f file-lists/math_list.txt
%{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-math_72.svg
%{_mandir}/man1/lomath*
%dir %{ooodir}/share/xdg
%{ooodir}/share/xdg/math.desktop
#----------------------------------------------------------------------------
@ -708,7 +705,6 @@ This package contains the word processor component for LibreOffice.
%{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-writer_72.svg
%{_mandir}/man1/loweb*
%{_mandir}/man1/lowriter*
%dir %{ooodir}/share/xdg
%{ooodir}/share/xdg/writer.desktop
%{_datadir}/appdata/libreoffice-writer.appdata.xml
@ -3177,6 +3173,8 @@ cd ..
# Split gallery
grep /share/gallery/ file-lists/common_list.txt >file-lists/gallery_list.txt
sed -i -e '/\/share\/gallery\//d' file-lists/common_list.txt
# calc.desktop, writer.desktop etc. go into libreoffice-calc, libreoffice-writer etc. subpackages
sed -i -e '/\/share\/xdg\/.*.desktop/d' file-lists/common_list.txt
# We catch those in a regex to catch Sun Template extras
sed -i -e '/gallery\/sg[0-9]*\..*/d' file-lists/gallery_list.txt
@ -3191,9 +3189,6 @@ cat file-lists/common_list.uniq.sorted.txt >>file-lists/core_list.txt
sort -u file-lists/core_list.txt > file-lists/core_list.uniq.sorted.txt
cat file-lists/core_list.uniq.sorted.txt > file-lists/core_list.txt
egrep -v "libreoffice/share/xdg/(base|calc|draw|impress|math|writer)" file-lists/core_list.txt > file-lists/core_list.uniq.sorted.txt
cat file-lists/core_list.uniq.sorted.txt > file-lists/core_list.txt
# files for help-* and l10n-* packages
%if %{with l10n}
%{expand:%(for i in %{langs}; do