diff options
| author | Remi Collet <remi@remirepo.net> | 2025-02-06 08:27:29 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-02-06 08:27:29 +0100 |
| commit | 999eb296a5fec21dd8b135d1f13a52ea0b19dfe5 (patch) | |
| tree | 3324f746dc4f9a95c4db02e467de1582f662d0c7 | |
| parent | d26891c0080f222d462295c9379cde5e43a2d178 (diff) | |
drop patch merged upstream
| -rw-r--r-- | ip2proxy-build.patch | 22 | ||||
| -rw-r--r-- | php-pecl-ip2proxy.spec | 14 |
2 files changed, 5 insertions, 31 deletions
diff --git a/ip2proxy-build.patch b/ip2proxy-build.patch deleted file mode 100644 index d38922e..0000000 --- a/ip2proxy-build.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 4b1ed2a22748f4adb7a5e30df9284147601ccd66 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Thu, 6 Feb 2025 06:44:46 +0100 -Subject: [PATCH] missing brackets - ---- - ip2proxy.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ip2proxy.c b/ip2proxy.c -index 0914c00..622f7ee 100644 ---- a/ip2proxy.c -+++ b/ip2proxy.c -@@ -47,7 +47,7 @@ static zend_function_entry ip2proxy_functions_entry[] = { - PHP_FE(ip2proxy_get_last_seen, ip2proxy_ip_address) - PHP_FE(ip2proxy_get_threat, ip2proxy_ip_address) - PHP_FE(ip2proxy_get_provider, ip2proxy_ip_address) -- PHP_FE(ip2proxy_get_fraud_score, ip2proxy_ip_address -+ PHP_FE(ip2proxy_get_fraud_score, ip2proxy_ip_address) - PHP_FE(ip2proxy_get_all, ip2proxy_ip_address) - PHP_FE(ip2proxy_close, ip2proxy_void) - PHP_FE(ip2proxy_delete_shm, ip2proxy_void) diff --git a/php-pecl-ip2proxy.spec b/php-pecl-ip2proxy.spec index e49e8f3..52d01f9 100644 --- a/php-pecl-ip2proxy.spec +++ b/php-pecl-ip2proxy.spec @@ -29,7 +29,7 @@ Summary: Get proxy information of an IP address Name: %{?scl_prefix}php-pecl-%{pecl_name} # library is MIT, extension is PHP -License: MIT and PHP-3.01 +License: MIT AND PHP-3.01 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} URL: https://pecl.php.net/package/igbinary @@ -40,9 +40,6 @@ Source1: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit Patch0: %{pecl_name}-bundledlib.patch Provides: bundled(%{gh_project}) = %{gh_version} -# Fix build -Patch1: %{pecl_name}-build.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-pear @@ -80,7 +77,6 @@ sed -e 's/role="test"/role="src"/' \ cd %{sources} %patch -P0 -p1 -b .rpm -%patch -P1 -p1 -b .pr6 # Check version extver=$(sed -n '/#define PHP_IP2PROXY_VERSION/{s/.* "//;s/".*$//;p}' php_ip2proxy.h) @@ -156,10 +152,6 @@ cd %{sources} --modules | grep %{pecl_name} %if %{with tests} -: Fix test suite -sed -e 's/string(2) "US"/string(1) "-"/;s/string(24) "United States of America"/string(1) "-"/' \ - -i tests/*phpt - : upstream test suite TEST_PHP_EXECUTABLE=%{__php} \ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ @@ -192,6 +184,10 @@ REPORT_EXIT_STATUS=1 \ %changelog * Thu Feb 6 2025 Remi Collet <remi@remirepo.net> - 3.1.0-1 +- update to 3.1.0 (new sources) +- drop patch merged upstream + +* Thu Feb 6 2025 Remi Collet <remi@remirepo.net> - 3.1.0-0 - update to 3.1.0 - fix build using patch from https://github.com/ip2location/ip2proxy-pecl/pull/6 |