pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Do not require update-desktop-files on 15+ bsc#1090737

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=652
This commit is contained in:
Tomáš Chvátal 2018-04-25 08:47:27 +00:00 committed by Git OBS Bridge
parent fd16999e1f
commit c2254d7fac
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libreoffice.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Apr 25 08:46:16 UTC 2018 - tchvatal@suse.com
- Do not require update-desktop-files on 15+ bsc#1090737
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 25 06:27:49 UTC 2018 - guillaume.gardet@opensuse.org Wed Apr 25 06:27:49 UTC 2018 - guillaume.gardet@opensuse.org

12
libreoffice.spec
View File

@ -232,8 +232,6 @@ Requires: libreoffice-branding >= 6.0
Requires: libreoffice-icon-themes = %{version} Requires: libreoffice-icon-themes = %{version}
Requires: libreoffice-l10n-en = %{version} Requires: libreoffice-l10n-en = %{version}
Requires: python3 Requires: python3
Requires(post): update-desktop-files
Requires(postun): update-desktop-files
Recommends: dejavu-fonts Recommends: dejavu-fonts
Recommends: google-carlito-fonts Recommends: google-carlito-fonts
Provides: %{name}-draw-extensions = %{version} Provides: %{name}-draw-extensions = %{version}
@ -255,6 +253,10 @@ Obsoletes: %{name}-icon-theme-crystal < %{version}
Provides: %{name}-icon-theme-oxygen = %{version} Provides: %{name}-icon-theme-oxygen = %{version}
Obsoletes: %{name}-icon-theme-oxygen < %{version} Obsoletes: %{name}-icon-theme-oxygen < %{version}
ExclusiveArch: aarch64 %{ix86} x86_64 ExclusiveArch: aarch64 %{ix86} x86_64
%if 0%{?suse_version} < 1500
Requires(post): update-desktop-files
Requires(postun): update-desktop-files
%endif
%if %{with gtk3} %if %{with gtk3}
BuildRequires: pkgconfig(glib-2.0) >= 2.40 BuildRequires: pkgconfig(glib-2.0) >= 2.40
BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk+-3.0)
@ -1284,9 +1286,11 @@ export SRCDIR="./"
%post %post
/sbin/ldconfig /sbin/ldconfig
%if 0%{?suse_version} < 1500
%mime_database_post %mime_database_post
%desktop_database_post %desktop_database_post
%icon_theme_cache_post %icon_theme_cache_post
%endif
%preun %preun
uno_cache="%{_libdir}/%{name}/share/uno_packages/cache/uno_packages/" uno_cache="%{_libdir}/%{name}/share/uno_packages/cache/uno_packages/"
@ -1297,10 +1301,13 @@ exit 0
%postun %postun
/sbin/ldconfig /sbin/ldconfig
%if 0%{?suse_version} < 1500
%icon_theme_cache_postun %icon_theme_cache_postun
%desktop_database_postun %desktop_database_postun
%mime_database_postun %mime_database_postun
%endif
%if 0%{?suse_version} < 1500
%post base %post base
%desktop_database_post %desktop_database_post
@ -1336,6 +1343,7 @@ exit 0
%postun writer %postun writer
%desktop_database_postun %desktop_database_postun
%endif
%_link_noarch_files icon-themes %_link_noarch_files icon-themes