Compare commits

..

No commits in common. "c8-stream-7.4" and "stream-php-8.2-rhel-8.10.0" have entirely different histories.

5 changed files with 23 additions and 45 deletions

8
.gitignore vendored
View File

@ -1 +1,7 @@
SOURCES/zip-1.18.2.tgz /zip-1.15.2.tgz
/zip-1.15.3.tgz
/zip-1.15.4.tgz
/zip-1.18.2.tgz
/zip-1.20.0.tgz
/zip-1.19.2.tgz
/zip-1.22.3.tgz

View File

@ -1 +0,0 @@
16e8422eb7b4fa5171a6787c17d3f663abf67311 SOURCES/zip-1.18.2.tgz

View File

@ -1,27 +0,0 @@
From 527c199656850e86e8528ddf508c086d1147970b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 18 May 2020 07:48:59 +0200
Subject: [PATCH] relax test (TZ issue)
---
tests/bug50678.phpt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/bug50678.phpt b/tests/bug50678.phpt
index 156318e..a09c54d 100644
--- a/tests/bug50678.phpt
+++ b/tests/bug50678.phpt
@@ -18,11 +18,11 @@ $zip->open($filename);
$zip->extractTo($dirname);
$zip->close();
-var_dump(date('Ymd', filemtime($dirname . '/entry1.txt')));
+var_dump(date('Ym', filemtime($dirname . '/entry1.txt')));
?>
Done
--EXPECT--
-string(8) "20060706"
+string(6) "200607"
Done
--CLEAN--
<?php

View File

@ -1,7 +1,7 @@
# RHEL / Fedora spec file for php-pecl-zip # RHEL / Fedora spec file for php-pecl-zip
# #
# Copyright (c) 2013-2020 Remi Collet # Copyright (c) 2013-2023 Remi Collet
# License: CC-BY-SA # License: CC-BY-SA-4.0
# http://creativecommons.org/licenses/by-sa/4.0/ # http://creativecommons.org/licenses/by-sa/4.0/
# #
# Please, preserve the changelog entries # Please, preserve the changelog entries
@ -14,7 +14,7 @@
%global with_zts 0%{?__ztsphp:1} %global with_zts 0%{?__ztsphp:1}
%global ini_name 40-%{pecl_name}.ini %global ini_name 40-%{pecl_name}.ini
%global upstream_version 1.18.2 %global upstream_version 1.22.3
#global upstream_prever RC6 #global upstream_prever RC6
Summary: A ZIP archive management extension Summary: A ZIP archive management extension
@ -22,14 +22,13 @@ Summary(fr): Une extension de gestion des ZIP
Name: php-pecl-zip Name: php-pecl-zip
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
Release: 1%{?dist} Release: 1%{?dist}
License: PHP License: PHP-3.01
URL: https://pecl.php.net/package/zip URL: https://pecl.php.net/package/zip
Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
# Upstream patch for test suite BuildRequires: make
Patch0: %{pecl_name}-tests.patch BuildRequires: gcc
BuildRequires: php-devel BuildRequires: php-devel
BuildRequires: pkgconfig(libzip) >= 1.0.0 BuildRequires: pkgconfig(libzip) >= 1.0.0
BuildRequires: zlib-devel BuildRequires: zlib-devel
@ -61,10 +60,8 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml -i package.xml
cd NTS cd NTS
%patch0 -p1
# Sanity check, really often broken # Sanity check, really often broken
extver=$(sed -n '/#define PHP_ZIP_VERSION/{s/.* "//;s/".*$//;p}' php5/php_zip.h) extver=$(sed -n '/#define PHP_ZIP_VERSION/{s/.* "//;s/".*$//;p}' php8/php_zip.h)
if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
: Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}. : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}.
exit 1 exit 1
@ -133,10 +130,8 @@ cd NTS
: upstream test suite for NTS extension : upstream test suite for NTS extension
TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \ TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
REPORT_EXIT_STATUS=1 \
NO_INTERACTION=1 \
TEST_PHP_EXECUTABLE=%{_bindir}/php \ TEST_PHP_EXECUTABLE=%{_bindir}/php \
%{_bindir}/php -n run-tests.php --show-diff %{_bindir}/php -n run-tests.php -q --show-diff
%if %{with_zts} %if %{with_zts}
cd ../ZTS cd ../ZTS
@ -147,10 +142,8 @@ cd ../ZTS
: upstream test suite for ZTS extension : upstream test suite for ZTS extension
TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \ TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
REPORT_EXIT_STATUS=1 \
NO_INTERACTION=1 \
TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \ TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \
%{_bindir}/zts-php -n run-tests.php --show-diff %{_bindir}/zts-php -n run-tests.php -q --show-diff
%endif %endif
@ -169,6 +162,12 @@ TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \
%changelog %changelog
* Mon Nov 27 2023 Remi Collet <rcollet@redhat.com> - 1.22.3-1
- update to 1.22.3 for PHP 8.2 RHEL-14705
* Tue Dec 14 2021 Remi Collet <rcollet@redhat.com> - 1.19.2-1
- update to 1.19.2
* Thu May 14 2020 Remi Collet <rcollet@redhat.com> - 1.18.2-1 * Thu May 14 2020 Remi Collet <rcollet@redhat.com> - 1.18.2-1
- update to 1.18.2 - update to 1.18.2

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (zip-1.22.3.tgz) = 5896352717dee850d222a78d617c6f37ccd932ad9e5ccb44ecd90cb7e2070dc1a391fdb7a626b32eb8f5c1565552ca0a375e5f75de483f772f9d5f154a858e85