Fix the conditional for rh#1728058

This commit is contained in:
Parag Nemade 2019-08-02 18:28:33 +05:30
parent 3beb9187e3
commit da0aa264e8
No known key found for this signature in database
GPG Key ID: 71932951EB71E972

View File

@ -4,7 +4,7 @@
Name: fontforge
Version: 20190413
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Outline and bitmap font editor
License: GPLv3+
@ -14,9 +14,7 @@ Source0: https://github.com/fontforge/%{name}/archive/%{gittag0}.tar.gz#/
Source1: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=snapshot;h=%{gnulib_githead};sf=tgz;name=gnulib-%{gnulib_githead}.tar.gz
# https://github.com/fontforge/fontforge/pull/1723
Patch0: fontforge-20190317-use-system-uthash.patch
%if 0%{?python3_version_nodots} >= 38
Patch1: fontforge-20190413-python-3.8-pkg-config.patch
%endif
Patch2: fontforge-20190413-fix-compilation-for-python-3.8-the-reserved-tp_print.patch
Requires: xdg-utils
@ -79,7 +77,13 @@ This package contains documentation files for %{name}.
%prep
%autosetup -p1
%setup -q
%patch0 -p1
%if 0%{?python3_version_nodots} >= 38
%patch1 -p1
%endif
%patch2 -p1
tar xzf %{SOURCE1}
sed -i -e '/^#!\//, 1d' pycontrib/webcollab.py
@ -160,6 +164,9 @@ chmod 644 $RPM_BUILD_ROOT%{_datadir}/fontforge/nodejs/collabwebview/js/contentEd
%doc htdocs
%changelog
* Fri Aug 02 2019 Parag Nemade <pnemade AT redhat DOT com> - 20190413-4
- Fix the conditional for rh#1728058
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20190413-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild