summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-08-22 15:40:59 +0200
committerRemi Collet <remi@remirepo.net>2019-08-22 15:40:59 +0200
commit24fe0734366aee99748182faef5dc6fa42683f47 (patch)
treef026b9b90d3e9984650a3b79cd88604bc244ef6d
parent605c9afb97a5aa8ad2445c868adf816289f4b8a2 (diff)
- fix error: Macro %%undefine is a built-inHEADmaster
see https://bugzilla.redhat.com/1744583
-rw-r--r--php74.spec9
1 files changed, 8 insertions, 1 deletions
diff --git a/php74.spec b/php74.spec
index 9af6ce0..0a93611 100644
--- a/php74.spec
+++ b/php74.spec
@@ -34,7 +34,7 @@
Summary: Package that installs PHP 7.4
Name: %scl_name
Version: 1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Source0: macros-build
@@ -182,6 +182,9 @@ install -d -m 755 %{buildroot}%{_localstatedir}/lib/pear/pkgxml
%scl_install
+%if %{?fedora} >= 31
+sed -e '/undefine/d' -i %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config
+%endif
cat %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config
# Add the scl_package_override macro
@@ -260,6 +263,10 @@ restorecon -R %{_localstatedir} &>/dev/null || :
%changelog
+* Thu Aug 22 2019 Remi Collet <remi@remirepo.net> 1.0-2
+- fix error: Macro %%undefine is a built-in
+ see https://bugzilla.redhat.com/1744583
+
* Mon May 20 2019 Remi Collet <remi@remirepo.net> 1.0-1
- initial package for 7.4