diff options
| author | Remi Collet <remi@remirepo.net> | 2019-12-05 09:05:23 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-12-05 09:05:23 +0100 |
| commit | f79d3fbabe4a38cf562c3c269395f2c798244730 (patch) | |
| tree | 6a11bb33c92f8afe7fbd2a7a550b1c5f1db47831 | |
| parent | caff8817f6a8c28255b78a9f69d6ffabb095efd2 (diff) | |
- update Archive_Tar to 1.4.9
- add patch for XML_Util and PHP 7.4 from
https://github.com/pear/XML_Util/pull/11
| -rw-r--r-- | 11.patch | 22 | ||||
| -rw-r--r-- | php-pear.spec | 13 |
2 files changed, 32 insertions, 3 deletions
diff --git a/11.patch b/11.patch new file mode 100644 index 0000000..cd2833d --- /dev/null +++ b/11.patch @@ -0,0 +1,22 @@ +From 9ae15ac27d8618ee7d402b47b0c239b6c41c45d9 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Thu, 28 Nov 2019 15:51:00 +0100 +Subject: [PATCH] fix phplint warning + +--- + XML/Util.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/XML/Util.php b/XML/Util.php +index 2a008d3..df37e07 100644 +--- a/XML/Util.php ++++ b/XML/Util.php +@@ -918,7 +918,7 @@ public static function splitQualifiedName($qname, $defaultNs = null) + public static function isValidName($string) + { + // check for invalid chars +- if (!preg_match('/^[[:alpha:]_]\\z/', $string{0})) { ++ if (!preg_match('/^[[:alpha:]_]\\z/', $string[0])) { + return XML_Util::raiseError( + 'XML names may only start with letter or underscore', + XML_UTIL_ERROR_INVALID_START diff --git a/php-pear.spec b/php-pear.spec index 1876732..b9e601a 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -20,7 +20,7 @@ %global metadir %{_localstatedir}/lib/pear %global getoptver 1.4.3 -%global arctarver 1.4.8 +%global arctarver 1.4.9 # https://pear.php.net/bugs/bug.php?id=19367 # Structures_Graph 1.0.4 - incorrect FSF address %global structver 1.1.1 @@ -40,7 +40,7 @@ Summary: PHP Extension and Application Repository framework Name: %{?scl_prefix}php-pear Version: 1.10.10 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 # PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD # Structures_Graph is LGPLv3+ @@ -61,6 +61,8 @@ Source23: http://pear.php.net/get/Structures_Graph-%{structver}.tgz Source24: http://pear.php.net/get/XML_Util-%{xmlutil}.tgz Source25: http://pear.php.net/get/PEAR_Manpages-%{manpages}.tgz +Patch0: https://patch-diff.githubusercontent.com/raw/pear/XML_Util/pull/11.patch + BuildArch: noarch BuildRequires: %{?scl_prefix}php(language) > 5.4 BuildRequires: %{?scl_prefix}php-cli @@ -277,7 +279,7 @@ install -m 644 -D macros.pear \ # apply patches on installed PEAR tree pushd %{buildroot}%{peardir} -: no patch +patch -p1 < %{PATCH0} popd # Why this file here ? @@ -463,6 +465,11 @@ fi %changelog +* Thu Dec 5 2019 Remi Collet <remi@remirepo.net> - 1:1.10.10-3 +- update Archive_Tar to 1.4.9 +- add patch for XML_Util and PHP 7.4 from + https://github.com/pear/XML_Util/pull/11 + * Thu Nov 21 2019 Remi Collet <remi@remirepo.net> - 1:1.10.10-2 - update Console_Getopt to 1.4.3 - drop patches merged upstream |