From 75f3b1c4f7812be1cb489830a210326ff787891f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Jan 2019 09:43:35 +0100 Subject: cleanup for EL-8 --- .gitignore | 8 ++++++++ php-pecl-jsonc.spec | 9 ++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fc9aa8c --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +clog +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/php-pecl-jsonc.spec b/php-pecl-jsonc.spec index 87139ca..5bf607b 100644 --- a/php-pecl-jsonc.spec +++ b/php-pecl-jsonc.spec @@ -3,7 +3,7 @@ # # Fedora spec file for php-pecl-jsonc # -# Copyright (c) 2013-2017 Remi Collet +# Copyright (c) 2013-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -32,7 +32,7 @@ Summary: Support for JSON serialization Name: %{?scl_prefix}php-pecl-%{proj_name} Version: 1.3.10 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} # PHP extension is PHP # jsonc-c is MIT # json-c/linkhask.c is Public Domain @@ -231,7 +231,7 @@ REPORT_EXIT_STATUS=1 \ %endif -%if 0%{?fedora} < 24 +%if 0%{?fedora} < 24 || 0%{?rhel} < 8 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -290,6 +290,9 @@ rm -rf %{buildroot} # Note to remi : remember to always build in remi-php55(56) first # %changelog +* Mon Jan 21 2019 Remi Collet - 1.3.10-3 +- cleanup for EL-8 + * Fri Jan 20 2017 Remi Collet - 1.3.10-2 - fix obsoletes -- cgit