diff options
| author | Remi Collet <remi@remirepo.net> | 2026-05-21 16:53:21 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2026-05-21 16:53:21 +0200 |
| commit | a5dde92584f430e3ed001256db7e40f5703d15ca (patch) | |
| tree | 7d026924c7b4c547ed001f2135d547dea66fa122 /php-iliaal-fastchart.spec | |
| parent | 8243434f684a373cac5226d684c6e168c8e3a45e (diff) | |
drop patches merged upstream
Diffstat (limited to 'php-iliaal-fastchart.spec')
| -rw-r--r-- | php-iliaal-fastchart.spec | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/php-iliaal-fastchart.spec b/php-iliaal-fastchart.spec index 0370fcf..9d7b085 100644 --- a/php-iliaal-fastchart.spec +++ b/php-iliaal-fastchart.spec @@ -30,15 +30,14 @@ Summary: Native C PHP extension for fast chart rendering # Extension is BSD-3-Clause # Libraries are MIT License: BSD-3-Clause AND MIT -Version: 1.1.0 +Version: 1.1.1 Release: 1%{?dist} %forgemeta -URL: %{forgeurl} -Source0: %{forgesource} +URL: %{forgeurl} +Source0: %{forgesource} -Patch0: https://patch-diff.githubusercontent.com/raw/iliaal/fastchart/pull/1.patch -Patch1: https://patch-diff.githubusercontent.com/raw/iliaal/fastchart/pull/2.patch -Patch2: https://patch-diff.githubusercontent.com/raw/iliaal/fastchart/pull/3.patch +# RPM font path first and remove Windows fonts +Patch0: %{pie_proj}-rpm.patch BuildRequires: make BuildRequires: %{?dtsprefix}gcc @@ -48,17 +47,21 @@ BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libwebp) # for tests +# See list in tests/_font_candidates.inc.php +# /usr/share/fonts/lato-fonts/Lato-Regular.ttf # /usr/share/fonts/dejavu-sans-fonts/DejaVuSans.ttf +BuildRequires: lato-fonts BuildRequires: dejavu-sans-fonts BuildRequires: %{?scl_prefix}php-gd BuildRequires: %{?scl_prefix}php-simplexml Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} +# See FASTCHART_DEFAULT_FONT_CANDIDATES in fastchart.c Requires: dejavu-sans-fonts -Provides: bundled(plutovg) = 1.3.2 -Provides: bundled(plutosvg) = 0.0.7 +Provides: bundled(plutovg) = 1.3.3 +Provides: bundled(plutosvg) = 0.0.8 Provides: bundled(qrcodegen) # Extension @@ -91,9 +94,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %forgesetup -%patch -P0 -p1 -%patch -P1 -p1 -%patch -P2 -p1 +%patch -P0 -p1 -b .rpm cp vendor/qrcodegen/LICENSE qrcodegen_LICENSE cp vendor/plutovg/LICENSE plutovg_LICENSE @@ -164,6 +165,14 @@ TEST_PHP_ARGS="-n -d extension=gd -d extension=simplexml -d extension=%{buildroo %changelog +* Thu May 21 2026 Remi Collet <remi@remirepo.net> - 1.1.1-1 +- update to 1.1.1 +- drop patches merged upstream + +* Sun May 17 2026 Remi Collet <remi@remirepo.net> - 1.1.0-2 +- test build with upstream patch +- open https://github.com/iliaal/fastchart/pull/4 fix font path + * Sat May 16 2026 Remi Collet <remi@remirepo.net> - 1.1.0-1 - new package - open https://github.com/iliaal/fastchart/pull/1 fix test, ensure searching in the right place |