summaryrefslogtreecommitdiffstats
path: root/php-pecl-yaconf.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php-pecl-yaconf.spec')
-rw-r--r--php-pecl-yaconf.spec14
1 files changed, 6 insertions, 8 deletions
diff --git a/php-pecl-yaconf.spec b/php-pecl-yaconf.spec
index 753347e..aa5cb59 100644
--- a/php-pecl-yaconf.spec
+++ b/php-pecl-yaconf.spec
@@ -19,20 +19,17 @@
Summary: Yet Another Configurations Container
Name: %{?scl_prefix}php-pecl-yaconf
-Version: 1.1.0
+Version: 1.1.1
License: PHP
URL: https://github.com/%{gh_owner}/%{gh_project}
%if 0%{?gh_date:1}
Release: 0.5.%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
%else
-Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
%endif
-Patch0: https://patch-diff.githubusercontent.com/raw/laruence/yaconf/pull/63.patch
-Patch1: https://patch-diff.githubusercontent.com/raw/laruence/yaconf/pull/66.patch
-
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel >= 7.0
@@ -90,9 +87,6 @@ mv %{pecl_name}-%{version} NTS
%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml}
cd NTS
-%patch0 -p1 -b .pr63
-%patch1 -p1 -b .pr66
-
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_YACONF_VERSION/{s/.* "//;s/".*$//;p}' php_yaconf.h)
if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then
@@ -233,6 +227,10 @@ fi
%changelog
+* Thu Dec 16 2021 Remi Collet <remi@remirepo.net> - 1.1.1-1
+- update to 1.1.1
+- drop patches merged upstream
+
* Tue Nov 30 2021 Remi Collet <remi@remirepo.net> - 1.1.0-4
- add patch for PHP 8.1 from https://github.com/laruence/yaconf/pull/66