diff options
Diffstat (limited to 'php-pecl-gnupg.spec')
| -rw-r--r-- | php-pecl-gnupg.spec | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/php-pecl-gnupg.spec b/php-pecl-gnupg.spec index 9e71a64..40af0a0 100644 --- a/php-pecl-gnupg.spec +++ b/php-pecl-gnupg.spec @@ -6,7 +6,11 @@ # # Please, preserve the changelog entries # -%{?scl:%scl_package php-pecl-gnupg} +%if 0%{?scl:1} +%scl_package php-pecl-gnupg +%else +%global _root_bindir %{_bindir} +%endif %if 0%{?fedora} >= 41 # TODO needs investigation @@ -21,7 +25,7 @@ %global pecl_name gnupg %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global ini_name 40-%{pecl_name}.ini -%global upstream_version 1.5.2 +%global upstream_version 1.5.3 #global upstream_prever RC2 %global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} %global _configure ../%{sources}/configure @@ -34,9 +38,6 @@ Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.". License: BSD-2-Clause URL: https://pecl.php.net/package/gnupg Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz -Source1: https://raw.githubusercontent.com/php-gnupg/php-gnupg/refs/tags/gnupg-%{upstream_version}/tests/no_uid_hint_msg.gpg - -Patch0: %{pecl_name}-tests.patch BuildRequires: make BuildRequires: %{?dtsprefix}gcc @@ -81,9 +82,6 @@ extension=%{pecl_name}.so EOF cd %{sources} -cp %{SOURCE1} tests/ -%patch -P0 -p1 - # Check extension version extver=$(sed -n '/#define PHP_GNUPG_VERSION/{s/.* "//;s/".*$//;p}' php_gnupg.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then @@ -99,9 +97,9 @@ mkdir ZTS %endif %if %{with gpg1} -%{_bindir}/gpg1 --version +%{_root_bindir}/gpg1 --version %else -%{_bindir}/gpg --version +%{_root_bindir}/gpg --version %endif @@ -159,7 +157,7 @@ done cd %{sources} unset GPG_AGENT_INFO %if %{with gpg1} -export GNUPGFILENAME=%{_bindir}/gpg1 +export GNUPGFILENAME=%{_root_bindir}/gpg1 %endif : Check if build NTS extension can be loaded @@ -200,6 +198,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Tue Jun 3 2025 Remi Collet <remi@remirepo.net> - 1.5.3-1 +- update to 1.5.3 +- drop patch merged upstream + * Tue Apr 8 2025 Remi Collet <remi@remirepo.net> - 1.5.2-1 - update to 1.5.2 - re-license spec file to CECILL-2.1 |