diff options
| -rw-r--r-- | composer.json | 13 | ||||
| -rw-r--r-- | php-pecl-xpass.spec | 40 |
2 files changed, 33 insertions, 20 deletions
diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..9e7fd3c --- /dev/null +++ b/composer.json @@ -0,0 +1,13 @@ +{ + "name": "remi/xpass", + "type": "php-ext", + "license": "PHP-3.01", + "description": "Extended password extension", + "require": { + "php": ">= 8.0.0" + }, + "php-ext": { + "extension-name": "xpass", + "configure-options": [] + } +} diff --git a/php-pecl-xpass.spec b/php-pecl-xpass.spec index 7db79c1..aaec13d 100644 --- a/php-pecl-xpass.spec +++ b/php-pecl-xpass.spec @@ -18,22 +18,30 @@ %global ini_name 40-%{pecl_name}.ini %global upstream_version 1.2.0 #global upstream_prever RC1 -%global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} +%global sources %{archivename} %global _configure ../%{sources}/configure +# Github forge +%global gh_vend remicollet +%global gh_proj php-xpass +%global forgeurl https://github.com/%{gh_vend}/%{gh_proj} +%global tag v%{upstream_version}%{?upstream_prever} +# for EL-8 to avoid TAG usage +%global archivename %{gh_proj}-%{upstream_version}%{?upstream_prever} + Summary: Extended password extension Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +%forgemeta +Release: 2%{?dist} License: PHP-3.01 -URL: https://pecl.php.net/package/%{pecl_name} -Source0: https://pecl.php.net/get/%{sources}.tgz +URL: %{forgeurl} +Source0: %{forgesource} BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: pkgconfig(libxcrypt) >= 4.4 BuildRequires: %{?scl_prefix}php-devel >= 8.0 -BuildRequires: %{?scl_prefix}php-pear Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} @@ -85,11 +93,6 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -q -c -# Don't install/register tests -sed -e 's/role="test"/role="src"/' \ - -e '/LICENSE/s/role="doc"/role="src"/' \ - -i package.xml - cd %{sources} # Sanity check, really often broken extver=$(sed -n '/#define PHP_XPASS_VERSION/{s/.* "//;s/".*$//;p}' php_xpass.h) @@ -143,20 +146,12 @@ cd ../ZTS # install config file 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 -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif -# Documentation -for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i -done - %check cd %{sources} @@ -187,8 +182,9 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}/%{php_ztsextdir}/%{pecl_name}.so" \ %files %license %{sources}/LICENSE -%doc %{pecl_docdir}/%{pecl_name} -%{pecl_xmldir}/%{name}.xml +%doc %{sources}/composer.json +%doc %{sources}/*.md +%doc %{sources}/CREDITS %config(noreplace) %{php_inidir}/%{ini_name} %{php_extdir}/%{pecl_name}.so @@ -200,6 +196,10 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}/%{php_ztsextdir}/%{pecl_name}.so" \ %changelog +* Wed Mar 11 2026 Remi Collet <remi@remirepo.net> - 1.2.0-2 +- drop pear/pecl dependency +- sources from github + * Tue Jan 13 2026 Remi Collet <remi@remirepo.net> - 1.2.0-1 - update to 1.2.0 |