Rebase to 3.75| Use devtoolset-9 on EPEL7

This commit is contained in:
sagitter 2020-10-05 16:12:14 +02:00
parent e91f851572
commit c6cef9fa22

View File

@ -1,3 +1,7 @@
%if 0%{?el7}
%global dts devtoolset-9-
%endif
Name: pstoedit Name: pstoedit
Version: 3.75 Version: 3.75
Release: 1%{?dist} Release: 1%{?dist}
@ -13,7 +17,7 @@ BuildRequires: gd-devel
BuildRequires: dos2unix BuildRequires: dos2unix
BuildRequires: ghostscript BuildRequires: ghostscript
BuildRequires: plotutils-devel BuildRequires: plotutils-devel
BuildRequires: gcc-c++, gcc BuildRequires: %{?dts}gcc-c++, %{?dts}gcc
BuildRequires: libzip-devel BuildRequires: libzip-devel
BuildRequires: ImageMagick-c++-devel BuildRequires: ImageMagick-c++-devel
%if 0%{?fedora} || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} > 7
@ -46,6 +50,10 @@ applications
dos2unix doc/*.htm doc/readme.txt dos2unix doc/*.htm doc/readme.txt
%build %build
%if 0%{?el7}
%{?dts:source /opt/rh/devtoolset-9/enable}
%endif
%configure --disable-static --enable-docs=no --with-libzip-include=%{_includedir} \ %configure --disable-static --enable-docs=no --with-libzip-include=%{_includedir} \
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
--without-emf --without-emf