From 9d9bb3e178eca33546fcc6a87d5342ef9474f383 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 25 Aug 2017 15:02:37 +0200 Subject: switch --- REFLECTION | 33 ++-- REFLECTION-PHP7 | 451 ----------------------------------------------- php-pecl-oauth-php7.spec | 299 ------------------------------- php-pecl-oauth.spec | 66 ++++--- 4 files changed, 53 insertions(+), 796 deletions(-) delete mode 100644 REFLECTION-PHP7 delete mode 100644 php-pecl-oauth-php7.spec diff --git a/REFLECTION b/REFLECTION index 28242cf..33e4908 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #111 OAuth version 1.2.3 ] { +Extension [ extension #71 OAuth version 2.0.2 ] { - Constants [32] { Constant [ string OAUTH_SIG_METHOD_HMACSHA1 ] { HMAC-SHA1 } @@ -70,7 +70,7 @@ Extension [ extension #111 OAuth version 1.2.3 ] { Property [ public $debugInfo ] } - - Methods [27] { + - Methods [26] { Method [ public method __construct ] { - Parameters [4] { @@ -257,16 +257,10 @@ Extension [ extension #111 OAuth version 1.2.3 ] { Parameter #2 [ $extra_parameters ] } } - - Method [ public method __destruct ] { - - - Parameters [0] { - } - } } } - Class [ class OAuthException extends Exception ] { + Class [ class OAuthException extends Exception implements Throwable ] { - Constants [0] { } @@ -286,7 +280,7 @@ Extension [ extension #111 OAuth version 1.2.3 ] { Property [ public $debugInfo ] } - - Methods [9] { + - Methods [10] { Method [ public method __construct ] { - Parameters [3] { @@ -296,28 +290,31 @@ Extension [ extension #111 OAuth version 1.2.3 ] { } } - Method [ final public method getMessage ] { + Method [ public method __wakeup ] { + } + + Method [ final public method getMessage ] { } - Method [ final public method getCode ] { + Method [ final public method getCode ] { } - Method [ final public method getFile ] { + Method [ final public method getFile ] { } - Method [ final public method getLine ] { + Method [ final public method getLine ] { } - Method [ final public method getTrace ] { + Method [ final public method getTrace ] { } - Method [ final public method getPrevious ] { + Method [ final public method getPrevious ] { } - Method [ final public method getTraceAsString ] { + Method [ final public method getTraceAsString ] { } - Method [ public method __toString ] { + Method [ public method __toString ] { } } } diff --git a/REFLECTION-PHP7 b/REFLECTION-PHP7 deleted file mode 100644 index 33e4908..0000000 --- a/REFLECTION-PHP7 +++ /dev/null @@ -1,451 +0,0 @@ -Extension [ extension #71 OAuth version 2.0.2 ] { - - - Constants [32] { - Constant [ string OAUTH_SIG_METHOD_HMACSHA1 ] { HMAC-SHA1 } - Constant [ string OAUTH_SIG_METHOD_HMACSHA256 ] { HMAC-SHA256 } - Constant [ string OAUTH_SIG_METHOD_RSASHA1 ] { RSA-SHA1 } - Constant [ string OAUTH_SIG_METHOD_PLAINTEXT ] { PLAINTEXT } - Constant [ integer OAUTH_AUTH_TYPE_AUTHORIZATION ] { 3 } - Constant [ integer OAUTH_AUTH_TYPE_URI ] { 1 } - Constant [ integer OAUTH_AUTH_TYPE_FORM ] { 2 } - Constant [ integer OAUTH_AUTH_TYPE_NONE ] { 4 } - Constant [ string OAUTH_HTTP_METHOD_GET ] { GET } - Constant [ string OAUTH_HTTP_METHOD_POST ] { POST } - Constant [ string OAUTH_HTTP_METHOD_PUT ] { PUT } - Constant [ string OAUTH_HTTP_METHOD_HEAD ] { HEAD } - Constant [ string OAUTH_HTTP_METHOD_DELETE ] { DELETE } - Constant [ integer OAUTH_REQENGINE_STREAMS ] { 1 } - Constant [ integer OAUTH_REQENGINE_CURL ] { 2 } - Constant [ integer OAUTH_SSLCHECK_NONE ] { 0 } - Constant [ integer OAUTH_SSLCHECK_HOST ] { 1 } - Constant [ integer OAUTH_SSLCHECK_PEER ] { 2 } - Constant [ integer OAUTH_SSLCHECK_BOTH ] { 3 } - Constant [ integer OAUTH_OK ] { 0 } - Constant [ integer OAUTH_BAD_NONCE ] { 4 } - Constant [ integer OAUTH_BAD_TIMESTAMP ] { 8 } - Constant [ integer OAUTH_CONSUMER_KEY_UNKNOWN ] { 16 } - Constant [ integer OAUTH_CONSUMER_KEY_REFUSED ] { 32 } - Constant [ integer OAUTH_INVALID_SIGNATURE ] { 64 } - Constant [ integer OAUTH_TOKEN_USED ] { 128 } - Constant [ integer OAUTH_TOKEN_EXPIRED ] { 256 } - Constant [ integer OAUTH_TOKEN_REVOKED ] { 512 } - Constant [ integer OAUTH_TOKEN_REJECTED ] { 1024 } - Constant [ integer OAUTH_VERIFIER_INVALID ] { 2048 } - Constant [ integer OAUTH_PARAMETER_ABSENT ] { 4096 } - Constant [ integer OAUTH_SIGNATURE_METHOD_REJECTED ] { 8192 } - } - - - Functions { - Function [ function oauth_urlencode ] { - - - Parameters [1] { - Parameter #0 [ $uri ] - } - } - Function [ function oauth_get_sbs ] { - - - Parameters [3] { - Parameter #0 [ $http_method ] - Parameter #1 [ $uri ] - Parameter #2 [ $parameters ] - } - } - } - - - Classes [3] { - Class [ class OAuth ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [3] { - Property [ public $debug ] - Property [ public $sslChecks ] - Property [ public $debugInfo ] - } - - - Methods [26] { - Method [ public method __construct ] { - - - Parameters [4] { - Parameter #0 [ $consumer_key ] - Parameter #1 [ $consumer_secret ] - Parameter #2 [ $signature_method ] - Parameter #3 [ $auth_type ] - } - } - - Method [ public method setRSACertificate ] { - - - Parameters [1] { - Parameter #0 [ $cert ] - } - } - - Method [ public method getRequestToken ] { - - - Parameters [2] { - Parameter #0 [ $request_token_url ] - Parameter #1 [ $callback_url ] - } - } - - Method [ public method getAccessToken ] { - - - Parameters [3] { - Parameter #0 [ $access_token_url ] - Parameter #1 [ $auth_session_handle ] - Parameter #2 [ $auth_verifier ] - } - } - - Method [ public method getLastResponse ] { - - - Parameters [0] { - } - } - - Method [ public method getLastResponseInfo ] { - - - Parameters [0] { - } - } - - Method [ public method getLastResponseHeaders ] { - - - Parameters [0] { - } - } - - Method [ public method setToken ] { - - - Parameters [2] { - Parameter #0 [ $token ] - Parameter #1 [ $token_secret ] - } - } - - Method [ public method setRequestEngine ] { - - - Parameters [1] { - Parameter #0 [ $reqengine ] - } - } - - Method [ public method setVersion ] { - - - Parameters [1] { - Parameter #0 [ $version ] - } - } - - Method [ public method setAuthType ] { - - - Parameters [1] { - Parameter #0 [ $auth_type ] - } - } - - Method [ public method setNonce ] { - - - Parameters [1] { - Parameter #0 [ $nonce ] - } - } - - Method [ public method setTimestamp ] { - - - Parameters [1] { - Parameter #0 [ $ts ] - } - } - - Method [ public method fetch ] { - - - Parameters [4] { - Parameter #0 [ $protected_resource_url ] - Parameter #1 [ $extra_parameters ] - Parameter #2 [ $http_method ] - Parameter #3 [ $request_headers ] - } - } - - Method [ public method enableDebug ] { - - - Parameters [0] { - } - } - - Method [ public method disableDebug ] { - - - Parameters [0] { - } - } - - Method [ public method enableSSLChecks ] { - - - Parameters [0] { - } - } - - Method [ public method disableSSLChecks ] { - - - Parameters [0] { - } - } - - Method [ public method enableRedirects ] { - - - Parameters [0] { - } - } - - Method [ public method disableRedirects ] { - - - Parameters [0] { - } - } - - Method [ public method setCAPath ] { - - - Parameters [2] { - Parameter #0 [ $ca_path ] - Parameter #1 [ $ca_info ] - } - } - - Method [ public method getCAPath ] { - - - Parameters [0] { - } - } - - Method [ public method generateSignature ] { - - - Parameters [3] { - Parameter #0 [ $http_method ] - Parameter #1 [ $url ] - Parameter #2 [ $extra_parameters ] - } - } - - Method [ public method setTimeout ] { - - - Parameters [1] { - Parameter #0 [ $timeout_in_milliseconds ] - } - } - - Method [ public method setSSLChecks ] { - - - Parameters [1] { - Parameter #0 [ $sslcheck ] - } - } - - Method [ public method getRequestHeader ] { - - - Parameters [3] { - Parameter #0 [ $http_method ] - Parameter #1 [ $url ] - Parameter #2 [ $extra_parameters ] - } - } - } - } - - Class [ class OAuthException extends Exception implements Throwable ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [6] { - Property [ protected $message ] - Property [ protected $code ] - Property [ protected $file ] - Property [ protected $line ] - Property [ public $lastResponse ] - Property [ public $debugInfo ] - } - - - Methods [10] { - Method [ public method __construct ] { - - - Parameters [3] { - Parameter #0 [ $message ] - Parameter #1 [ $code ] - Parameter #2 [ $previous ] - } - } - - Method [ public method __wakeup ] { - } - - Method [ final public method getMessage ] { - } - - Method [ final public method getCode ] { - } - - Method [ final public method getFile ] { - } - - Method [ final public method getLine ] { - } - - Method [ final public method getTrace ] { - } - - Method [ final public method getPrevious ] { - } - - Method [ final public method getTraceAsString ] { - } - - Method [ public method __toString ] { - } - } - } - - Class [ class OAuthProvider ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [2] { - Method [ final static public method reportProblem ] { - - - Parameters [1] { - Parameter #0 [ $oauthexception ] - } - } - - Method [ final static public method generateToken ] { - - - Parameters [2] { - Parameter #0 [ $size ] - Parameter #1 [ $strong ] - } - } - } - - - Properties [0] { - } - - - Methods [14] { - Method [ public method __construct ] { - - - Parameters [1] { - Parameter #0 [ $params_array ] - } - } - - Method [ public method consumerHandler ] { - - - Parameters [1] { - Parameter #0 [ $function_name ] - } - } - - Method [ public method tokenHandler ] { - - - Parameters [1] { - Parameter #0 [ $function_name ] - } - } - - Method [ public method timestampNonceHandler ] { - - - Parameters [1] { - Parameter #0 [ $function_name ] - } - } - - Method [ public method callconsumerHandler ] { - - - Parameters [0] { - } - } - - Method [ public method calltokenHandler ] { - - - Parameters [0] { - } - } - - Method [ public method callTimestampNonceHandler ] { - - - Parameters [0] { - } - } - - Method [ public method checkOAuthRequest ] { - - - Parameters [2] { - Parameter #0 [ $uri ] - Parameter #1 [ $method ] - } - } - - Method [ public method isRequestTokenEndpoint ] { - - - Parameters [1] { - Parameter #0 [ $params_array ] - } - } - - Method [ final public method setRequestTokenPath ] { - - - Parameters [1] { - Parameter #0 [ $path ] - } - } - - Method [ final public method addRequiredParameter ] { - - - Parameters [1] { - Parameter #0 [ $req_params ] - } - } - - Method [ final public method setParam ] { - - - Parameters [2] { - Parameter #0 [ $param_key ] - Parameter #1 [ $param_val ] - } - } - - Method [ final public method removeRequiredParameter ] { - - - Parameters [1] { - Parameter #0 [ $req_params ] - } - } - - Method [ public method is2LeggedEndpoint ] { - - - Parameters [1] { - Parameter #0 [ $params_array ] - } - } - } - } - } -} - diff --git a/php-pecl-oauth-php7.spec b/php-pecl-oauth-php7.spec deleted file mode 100644 index ac8e8a8..0000000 --- a/php-pecl-oauth-php7.spec +++ /dev/null @@ -1,299 +0,0 @@ -# remirepo spec file for php-pecl-oauth -# with SCL compatibility, from Fedora: -# -# Fedora spec file for php-pecl-oauth -# -# License: MIT -# http://opensource.org/licenses/MIT -# -# Please, preserve the changelog entries -# -%if 0%{?scl:1} -%global sub_prefix %{scl_prefix} -%scl_package php-pecl-oauth -%endif - -%global pecl_name oauth -%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%global ini_name 40-%{pecl_name}.ini - -Name: %{?sub_prefix}php-pecl-oauth -Version: 2.0.2 -Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -Summary: PHP OAuth consumer extension -Group: Development/Languages -License: BSD -URL: http://pecl.php.net/package/oauth -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz - -BuildRequires: %{?scl_prefix}php-devel >= 7 -BuildRequires: %{?scl_prefix}php-pear -BuildRequires: pcre-devel -BuildRequires: libcurl-devel - -Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} -Requires: %{?scl_prefix}php(api) = %{php_core_api} -%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} - -Provides: %{?scl_prefix}php-%{pecl_name} = %{version} -Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} -%if "%{?scl_prefix}" != "%{?sub_prefix}" -Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} -%endif - -%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -# Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} -Obsoletes: php53u-pecl-%{pecl_name} <= %{version} -Obsoletes: php54-pecl-%{pecl_name} <= %{version} -Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -Obsoletes: php55u-pecl-%{pecl_name} <= %{version} -Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -Obsoletes: php56u-pecl-%{pecl_name} <= %{version} -Obsoletes: php56w-pecl-%{pecl_name} <= %{version} -Obsoletes: php70u-pecl-%{pecl_name} <= %{version} -Obsoletes: php70w-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "7.1" -Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -Obsoletes: php71w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.2" -Obsoletes: php72u-pecl-%{pecl_name} <= %{version} -Obsoletes: php72w-pecl-%{pecl_name} <= %{version} -%endif -%endif - -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter shared private -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} -%endif - - -%description -OAuth is an authorization protocol built on top of HTTP which allows -applications to securely access data without having to store -user names and passwords. - -Documentation: http://php.net/oauth - -Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}. - - -%prep -%setup -q -c - -mv %{pecl_name}-%{version} NTS - -# Don't install/register tests -sed -e 's/role="test"/role="src"/' \ - %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ - -i package.xml - -# Sanity check, really often broken -extver=$(sed -n '/#define PHP_OAUTH_VERSION/{s/.* //;s/".*$//;p}' NTS/php_oauth.h) -if test "x${extver}" != "x%{version}"; then - : Error: Upstream extension version is ${extver}, expecting %{version}. - exit 1 -fi - -cat >%{ini_name} << 'EOF' -; Enable %{pecl_name} extension module -extension=%{pecl_name}.so -EOF - -%if %{with_zts} -# duplicate for ZTS build -cp -pr NTS ZTS -%endif - - -%build -cd NTS -%{_bindir}/phpize -%configure --with-php-config=%{_bindir}/php-config -make %{?_smp_mflags} - -%if %{with_zts} -cd ../ZTS -%{_bindir}/zts-phpize -%configure --with-php-config=%{_bindir}/zts-php-config -make %{?_smp_mflags} -%endif - - -%install -make install -C NTS INSTALL_ROOT=%{buildroot} - -# Drop in the bit of configuration -install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} - -# Install XML package description -install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml - -%if %{with_zts} -make install -C ZTS INSTALL_ROOT=%{buildroot} -install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} -%endif - -# Documentation -cd NTS -for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i -done - - -%if 0%{?fedora} < 24 -# when pear installed alone, after us -%triggerin -- %{?scl_prefix}php-pear -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -# posttrans as pear can be installed after us -%posttrans -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -%postun -if [ $1 -eq 0 -a -x %{__pecl} ] ; then - %{pecl_uninstall} %{pecl_name} >/dev/null || : -fi -%endif - - -%check -: Minimal load test for NTS extension -%{__php} -n \ - -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ - --modules | grep OAuth - -%if %{with_zts} -: Minimal load test for ZTS extension -%{__ztsphp} -n \ - -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ - --modules | grep OAuth -%endif - - -%files -%{?_licensedir:%license NTS/LICENSE} -%doc %{pecl_docdir}/%{pecl_name} -%{pecl_xmldir}/%{name}.xml - -%config(noreplace) %{php_inidir}/%{ini_name} -%{php_extdir}/%{pecl_name}.so - -%if %{with_zts} -%config(noreplace) %{php_ztsinidir}/%{ini_name} -%{php_ztsextdir}/%{pecl_name}.so -%endif - - -%changelog -* Tue Jul 18 2017 Remi Collet - 2.0.2-4.7.0 -- rebuild for PHP 7.2.0beta1 new API - -* Thu Dec 1 2016 Remi Collet - 2.0.2-3 -- rebuild with PHP 7.1.0 GA - -* Wed Sep 14 2016 Remi Collet - 2.0.2-2 -- rebuild for PHP 7.1 new API version - -* Mon Jun 20 2016 Remi Collet - 2.0.2-1 -- update to 2.0.2 - -* Fri Mar 11 2016 Remi Collet - 2.0.1-1 -- update to 2.0.1 - -* Sun Mar 6 2016 Remi Collet - 2.0.0-2 -- adapt for F24 - -* Sun Jan 3 2016 Remi Collet - 2.0.0-1 -- update to 2.0.0 (php 7, stable) - -* Tue Jun 23 2015 Remi Collet - 1.2.3-10 -- allow build against rh-php56 (as more-php56) - -* Fri Jan 23 2015 Remi Collet - 1.2.3-9 -- fix %%postun scriplet - -* Thu Jan 22 2015 Remi Collet - 1.2.3-8 -- bump release -- drop runtime dependency on pear, new scriptlets - -* Wed Dec 24 2014 Remi Collet - 1.2.3-7.1 -- Fedora 21 SCL mass rebuild - -* Mon Aug 25 2014 Remi Collet - 1.2.3-7 -- improve SCL build - -* Wed Apr 16 2014 Remi Collet - 1.2.3-6 -- add numerical prefix to extension configuration file (php 5.6) - -* Wed Mar 19 2014 Remi Collet - 1.2.3-5 -- allow SCL build - -* Wed Mar 12 2014 Remi Collet - 1.2.3-4 -- cleanups -- move doc in pecl_docdir - -* Fri Nov 30 2012 Remi Collet - 1.2.3-1.1 -- also provides php-oauth - -* Tue Oct 2 2012 Remi Collet - 1.2.3-1 -- update to 1.2.3 - -* Tue Sep 4 2012 Remi Collet - 1.2.2-4 -- EL rebuild - -* Sun Nov 13 2011 Remi Collet - 1.2.2-3 -- build against php 5.4 - -* Tue Oct 04 2011 Remi Collet - 1.2.2-2 -- ZTS extension - -* Fri Jul 22 2011 Remi Collet - 1.2.2-1 -- update to 1.2.2 - -* Fri Jul 22 2011 Remi Collet - 1.2.1-1 -- rebuild for remi repo - -* Fri Jul 22 2011 F. Kooman - 1.2.1-1 -- update to 1.2.1 (RHBZ #724872). See - http://pecl.php.net/package-changelog.php?package=oauth&release=1.2.1 - -* Mon Jul 04 2011 Remi Collet - 1.2-1 -- rebuild for remi repo - -* Sun Jul 03 2011 F. Kooman - 1.2-1 -- upgrade to 1.2 - -* Sat Jun 25 2011 Remi Collet - 1.1.0-6 -- rebuild for remi repo - -* Sun Jun 19 2011 F. Kooman - 1.1.0-6 -- add fix for http://pecl.php.net/bugs/bug.php?id=22337 - -* Tue Jun 14 2011 Remi Collet - 1.1.0-5 -- rebuild for remi repo - -* Mon Jun 13 2011 F. Kooman - 1.1.0-5 -- remove php_apiver marco, was not used - -* Mon Jun 13 2011 F. Kooman - 1.1.0-4 -- add minimal check to see if module loads -- fix private-shared-object-provides rpmlint warning - -* Sat Jun 11 2011 F. Kooman - 1.1.0-3 -- BR pcre-devel - -* Sat May 28 2011 F. Kooman - 1.1.0-2 -- require libcurl for cURL request engine support - -* Sat May 28 2011 F. Kooman - 1.1.0-1 -- initial package diff --git a/php-pecl-oauth.spec b/php-pecl-oauth.spec index 35d82db..ac8e8a8 100644 --- a/php-pecl-oauth.spec +++ b/php-pecl-oauth.spec @@ -9,38 +9,27 @@ # Please, preserve the changelog entries # %if 0%{?scl:1} -%if "%{scl}" == "rh-php56" -%global sub_prefix more-php56- -%else %global sub_prefix %{scl_prefix} +%scl_package php-pecl-oauth %endif -%endif - -%{?scl: %scl_package php-pecl-oauth} %global pecl_name oauth -%global with_zts 0%{?__ztsphp:1} -%if "%{php_version}" < "5.6" -%global ini_name %{pecl_name}.ini -%else +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global ini_name 40-%{pecl_name}.ini -%endif Name: %{?sub_prefix}php-pecl-oauth -Version: 1.2.3 -Release: 11%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 2.0.2 +Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: PHP OAuth consumer extension Group: Development/Languages License: BSD URL: http://pecl.php.net/package/oauth Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: %{?scl_prefix}php-devel +BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: pcre-devel -# curl instead of libcurl for old release -BuildRequires: curl-devel +BuildRequires: libcurl-devel Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} @@ -50,8 +39,10 @@ Provides: %{?scl_prefix}php-%{pecl_name} = %{version} Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +%if "%{?scl_prefix}" != "%{?sub_prefix}" Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} +%endif %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff @@ -59,13 +50,19 @@ Obsoletes: php53-pecl-%{pecl_name} <= %{version} Obsoletes: php53u-pecl-%{pecl_name} <= %{version} Obsoletes: php54-pecl-%{pecl_name} <= %{version} Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "5.5" Obsoletes: php55u-pecl-%{pecl_name} <= %{version} Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "5.6" Obsoletes: php56u-pecl-%{pecl_name} <= %{version} Obsoletes: php56w-pecl-%{pecl_name} <= %{version} +Obsoletes: php70u-pecl-%{pecl_name} <= %{version} +Obsoletes: php70w-pecl-%{pecl_name} <= %{version} +%if "%{php_version}" > "7.1" +Obsoletes: php71u-pecl-%{pecl_name} <= %{version} +Obsoletes: php71w-pecl-%{pecl_name} <= %{version} +%endif +%if "%{php_version}" > "7.2" +Obsoletes: php72u-pecl-%{pecl_name} <= %{version} +Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif %endif @@ -81,6 +78,8 @@ OAuth is an authorization protocol built on top of HTTP which allows applications to securely access data without having to store user names and passwords. +Documentation: http://php.net/oauth + Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}. @@ -127,8 +126,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} - make install -C NTS INSTALL_ROOT=%{buildroot} # Drop in the bit of configuration @@ -149,10 +146,6 @@ do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%clean -rm -rf %{buildroot} - - %if 0%{?fedora} < 24 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear @@ -188,7 +181,6 @@ fi %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -203,9 +195,27 @@ fi %changelog -* Tue Mar 8 2016 Remi Collet - 1.2.3-11 +* Tue Jul 18 2017 Remi Collet - 2.0.2-4.7.0 +- rebuild for PHP 7.2.0beta1 new API + +* Thu Dec 1 2016 Remi Collet - 2.0.2-3 +- rebuild with PHP 7.1.0 GA + +* Wed Sep 14 2016 Remi Collet - 2.0.2-2 +- rebuild for PHP 7.1 new API version + +* Mon Jun 20 2016 Remi Collet - 2.0.2-1 +- update to 2.0.2 + +* Fri Mar 11 2016 Remi Collet - 2.0.1-1 +- update to 2.0.1 + +* Sun Mar 6 2016 Remi Collet - 2.0.0-2 - adapt for F24 +* Sun Jan 3 2016 Remi Collet - 2.0.0-1 +- update to 2.0.0 (php 7, stable) + * Tue Jun 23 2015 Remi Collet - 1.2.3-10 - allow build against rh-php56 (as more-php56) -- cgit