- Use python3 everywhere

- Drop fonttools test dep as it pulls TON of py3 packages

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/graphite2?expand=0&rev=59
This commit is contained in:
Tomáš Chvátal 2018-03-16 13:42:58 +00:00 committed by Git OBS Bridge
parent 859e777c2a
commit 58bc634c30
2 changed files with 12 additions and 10 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Mar 16 12:58:15 UTC 2018 - tchvatal@suse.com
- Use python3 everywhere
- Drop fonttools test dep as it pulls TON of py3 packages
-------------------------------------------------------------------
Mon Mar 12 13:13:26 UTC 2018 - pgajdos@suse.com

View File

@ -31,17 +31,11 @@ Patch2: link-gcc-shared.diff
Patch3: graphite2-CVE-2018-7999.patch
BuildRequires: cmake
BuildRequires: fontconfig-devel
# Required for tests
BuildRequires: fonttools
BuildRequires: freetype2-devel
BuildRequires: gcc-c++
BuildRequires: glib2-devel
BuildRequires: pkgconfig
%if %{suse_version} >= 1330
BuildRequires: python3-base
%else
BuildRequires: python-base
%endif
%description
Graphite2 is a project within SIL's Non-Roman Script Initiative and Language
@ -85,12 +79,11 @@ This package contains the %{name} development files.
%patch2 -p1
%patch3 -p1
%build
# Make sure to use python3 everywhere
%if %{suse_version} >= 1330
find tests -type f -exec sed -i "s|python|python3|g" {} +
find . -name *.cmake -exec sed -i "s|python|python3|g" {} +
%endif
%build
%cmake \
-DGRAPHITE2_COMPARE_RENDERER=OFF \
-DGRAPHITE2_NTRACING=ON \
@ -106,7 +99,10 @@ make %{?_smp_mflags}
find %{buildroot} -type f -name "*.la" -delete -print
%check
%ctest
# exclude tests based on fonttool
cd build
ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} \
-E "padaukcmp1|chariscmp1|chariscmp2|annacmp1|schercmp1|awamicmp1|awamicmp2"
%post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig