rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use system ucpp on rhel

Browse Source
This commit is contained in:
Caolán McNamara 2018-05-03 12:07:00 +01:00
parent ad963bd588
commit 629290ab96
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libreoffice.spec
View File

@ -98,10 +98,6 @@ Source47: https://raw.githubusercontent.com/gnome-design-team/gnome-icons/
Source48: https://raw.githubusercontent.com/gnome-design-team/gnome-icons/master/apps-symbolic/Adwaita/scalable/apps/libreoffice-writer-symbolic.svg
%if 0%{?rhel}
Source100: %{external_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
%global bundling_options %{?bundling_options} --without-system-ucpp
Provides: bundled(ucpp) = 1.3.2
%if 0%{?rhel} < 8
Source200: %{external_url}/mdds-1.3.1.tar.bz2
@ -150,8 +146,8 @@ BuildRequires: make
BuildRequires: perl(Digest::MD5)
%if 0%{?fedora}
BuildRequires: libappstream-glib
BuildRequires: ucpp
%endif
BuildRequires: ucpp
BuildRequires: zip
# libs / headers - common
@ -1079,7 +1075,7 @@ export CFLAGS=$ARCH_FLAGS
export CXXFLAGS=$ARCH_FLAGS
%if 0%{?rhel}
%define distrooptions --disable-eot --enable-python=system
%define distrooptions --disable-eot --enable-python=system --with-system-ucpp
%else # fedora
%define distrooptions --enable-eot --enable-kde4 --with-system-ucpp
%endif