summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-09-20 18:05:01 +0200
committerRemi Collet <remi@php.net>2022-09-20 18:05:01 +0200
commit650646c147b0bfab5646d920d03ad9bdc4014601 (patch)
tree5814d6fb17824b5ca30d271c7e8acb5f30ae5a73
parent49bb467d1ddc7c1b86fd76543973ed9b5bd1ef61 (diff)
drop unneeded build dependency on pcre #2128353HEADmaster
-rw-r--r--oauth-pcre.patch23
-rw-r--r--php-pecl-oauth.spec11
2 files changed, 31 insertions, 3 deletions
diff --git a/oauth-pcre.patch b/oauth-pcre.patch
new file mode 100644
index 0000000..31635ca
--- /dev/null
+++ b/oauth-pcre.patch
@@ -0,0 +1,23 @@
+From 2e02631fa424639b10d105ff47e9cf650403cef7 Mon Sep 17 00:00:00 2001
+From: Andy Postnikov <apostnikov@gmail.com>
+Date: Fri, 18 Sep 2020 16:22:33 +0300
+Subject: [PATCH] Remove pcre.h dependency
+
+PHP using pcre2 and I see no usage of pcre 1
+---
+ config.m4 | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/config.m4 b/config.m4
+index f4a6899..2adf937 100644
+--- a/config.m4
++++ b/config.m4
+@@ -10,8 +10,6 @@ if test "$PHP_OAUTH" != "no"; then
+ PHP_NEW_EXTENSION(oauth, oauth.c provider.c, $ext_shared)
+ CFLAGS="$CFLAGS -Wall -g"
+
+- AC_CHECK_HEADER(pcre.h, , [AC_MSG_ERROR([Couldn't find pcre.h, try installing the libpcre development/headers package])])
+-
+ AS_IF([test "x$with_curl" != "xno"],
+ [
+ AC_MSG_CHECKING(for cURL in default path)
diff --git a/php-pecl-oauth.spec b/php-pecl-oauth.spec
index dc31488..15a77f3 100644
--- a/php-pecl-oauth.spec
+++ b/php-pecl-oauth.spec
@@ -21,13 +21,14 @@
Name: %{?scl_prefix}php-pecl-oauth
Version: 2.0.7
-Release: 6%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 7%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Summary: PHP OAuth consumer extension
License: BSD
URL: https://pecl.php.net/package/oauth
Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
-Patch0: %{pecl_name}-php82.patch
+Patch0: %{pecl_name}-pcre.patch
+Patch1: %{pecl_name}-php82.patch
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
@@ -90,7 +91,8 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd NTS
-%patch0 -p1 -b .pr24
+%patch0 -p1 -b .up
+%patch1 -p1 -b .pr24
#sed -e '/PHP_OAUTH_VERSION/s/2.0.3-dev/2.0.3/' -i php_oauth.h
# Sanity check, really often broken
@@ -211,6 +213,9 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Tue Sep 20 2022 Remi Collet <remi@remirepo.net> - 2.0.7-7
+- drop unneeded build dependency on pcre #2128353
+
* Fri Sep 9 2022 Remi Collet <remi@remirepo.net> - 2.0.7-6
- add patch for PHP 8.2 from
https://github.com/php/pecl-web_services-oauth/pull/24