diff options
| author | Remi Collet <remi@remirepo.net> | 2020-07-06 07:31:31 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-07-06 07:31:31 +0200 |
| commit | 31f228704d37774d18a96b4f2cf010ea91a59823 (patch) | |
| tree | 7c8ea244c633d22a8bc3b03353d3ef53629f355b /php-pdlib.spec | |
| parent | 05698f70edcd3106021425ac36023964e527e72e (diff) | |
update to 1.0.1
drop patches merged upstream
Diffstat (limited to 'php-pdlib.spec')
| -rw-r--r-- | php-pdlib.spec | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/php-pdlib.spec b/php-pdlib.spec index eda6711..0f8f6e9 100644 --- a/php-pdlib.spec +++ b/php-pdlib.spec @@ -13,12 +13,11 @@ %global pkg_name %{name} %endif -# use master, see https://github.com/goodspb/pdlib/issues/28 -%global gh_commit 45c0b7441aa1f4348996d0f5ca55a2c8b072a381 +%global gh_commit c7d57a7a1b12865096e98c08e6eb2b6daed1dc52 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner goodspb %global gh_project pdlib -%global gh_date 20200620 +#global gh_date 20200620 %global pecl_name pdlib %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global ini_name 40-%{pecl_name}.ini @@ -37,7 +36,7 @@ BuildRequires: devtoolset-7-toolchain Summary: A PHP extension for Dlib Name: %{?sub_prefix}php-%{pecl_name} -Version: 1.0 +Version: 1.0.1 %if 0%{?gh_date:1} Release: 1.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %else @@ -47,9 +46,6 @@ License: MIT URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz -Patch0: https://patch-diff.githubusercontent.com/raw/goodspb/pdlib/pull/27.patch -Patch1: https://patch-diff.githubusercontent.com/raw/goodspb/pdlib/pull/29.patch - BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: dlib-devel @@ -91,9 +87,6 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO mv %{gh_project}-%{gh_commit} NTS cd NTS -%patch0 -p1 -b .pr27 -%patch1 -p1 -b .pr29 - # Sanity check, really often broken extver=$(sed -n '/#define PHP_PDLIB_VERSION/{s/.* "//;s/".*$//;p}' php_pdlib.h) if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then @@ -196,6 +189,10 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ %changelog +* Mon Jul 6 2020 Remi Collet <remi@remirepo.net> - 1.0.1-1 +- update to 1.0.1 +- drop patches merged upstream + * Mon Jun 22 2020 Remi Collet <remi@remirepo.net> - 1.0-1.20200620git45c0b74 - new package - open https://github.com/goodspb/pdlib/pull/25 fix linker command |