From 8785bf8e2f421a7ba33d51ecc64f2d1511670bf1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 3 Jan 2022 07:28:34 +0100 Subject: update to 1.2.0RC2 drop patches merged upstream --- php-pecl-fann.spec | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'php-pecl-fann.spec') diff --git a/php-pecl-fann.spec b/php-pecl-fann.spec index 41047d6..65d92af 100644 --- a/php-pecl-fann.spec +++ b/php-pecl-fann.spec @@ -3,7 +3,7 @@ # # Fedora spec file for php-pecl-fann # -# Copyright (c) 2013-2021 Remi Collet +# Copyright (c) 2013-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -24,18 +24,16 @@ %endif %global upstream_version 1.2.0 -%global upstream_prever RC1 +%global upstream_prever RC2 Summary: Wrapper for FANN Library Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz -Patch0: %{pecl_name}-php81.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: fann-devel > 2.1 @@ -57,9 +55,6 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{rele %if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -%if "%{php_version}" > "7.3" -Obsoletes: php73-pecl-%{pecl_name} <= %{version} -%endif %if "%{php_version}" > "7.4" Obsoletes: php74-pecl-%{pecl_name} <= %{version} %endif @@ -91,8 +86,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 - # Sanity check, really often broken extver=$(sed -n '/#define PHP_FANN_VERSION/{s/.* "//;s/".*$//;p}' php_fann.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then @@ -223,6 +216,10 @@ fi %changelog +* Mon Jan 3 2022 Remi Collet - 1.2.0~RC2-1 +- update to 1.2.0RC2 +- drop patches merged upstream + * Wed Sep 01 2021 Remi Collet - 1.2.0~RC1-3 - rebuild for 8.1.0RC1 -- cgit