diff options
| author | Remi Collet <remi@remirepo.net> | 2019-12-06 12:51:24 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-12-06 12:51:24 +0100 |
| commit | 7b4222a6860c851edbe0809568a3b6ffd86fe57d (patch) | |
| tree | add1fa818f64b883392b6a827f06d2d355ed30fa | |
| parent | f79d3fbabe4a38cf562c3c269395f2c798244730 (diff) | |
- update XML_Util to 1.4.4
- drop patch merged upstream
| -rw-r--r-- | 11.patch | 22 | ||||
| -rw-r--r-- | php-pear.spec | 12 |
2 files changed, 7 insertions, 27 deletions
diff --git a/11.patch b/11.patch deleted file mode 100644 index cd2833d..0000000 --- a/11.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 b9e601a..710979b 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -24,7 +24,7 @@ # https://pear.php.net/bugs/bug.php?id=19367 # Structures_Graph 1.0.4 - incorrect FSF address %global structver 1.1.1 -%global xmlutil 1.4.3 +%global xmlutil 1.4.4 %global manpages 1.10.0 # Tests are only run with rpmbuild --with tests @@ -40,7 +40,7 @@ Summary: PHP Extension and Application Repository framework Name: %{?scl_prefix}php-pear Version: 1.10.10 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 # PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD # Structures_Graph is LGPLv3+ @@ -61,8 +61,6 @@ 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 @@ -279,7 +277,7 @@ install -m 644 -D macros.pear \ # apply patches on installed PEAR tree pushd %{buildroot}%{peardir} -patch -p1 < %{PATCH0} +: no patch popd # Why this file here ? @@ -465,6 +463,10 @@ fi %changelog +* Fri Dec 6 2019 Remi Collet <remi@remirepo.net> - 1:1.10.10-4 +- update XML_Util to 1.4.4 +- drop patch merged upstream + * 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 |