update XML_Util to 1.4.4

drop patch merged upstream
This commit is contained in:
Remi Collet 2019-12-06 12:50:00 +01:00
parent 6a497dad34
commit 6917b03041
4 changed files with 9 additions and 28 deletions

1
.gitignore vendored
View File

@ -52,3 +52,4 @@ clog
/PEAR-1.10.10.tgz
/Console_Getopt-1.4.3.tgz
/Archive_Tar-1.4.9.tgz
/XML_Util-1.4.4.tgz

View File

@ -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

View File

@ -13,7 +13,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
@ -27,7 +27,7 @@
Summary: PHP Extension and Application Repository framework
Name: 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+
@ -47,8 +47,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: php(language) > 5.4
BuildRequires: php-cli
@ -221,7 +219,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 ?
@ -335,6 +333,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

View File

@ -3,4 +3,4 @@ SHA512 (Console_Getopt-1.4.3.tgz) = 7803e063576e9dac6833064b5a1479d22ca31c2a8ef8
SHA512 (PEAR-1.10.10.tgz) = a05296dd5831c3290ab514cf128f48ecf3d60a0de5c46e22653ac552aea64eabdc536ec51487d062f7402cb653862e104b70e341be6b10d4ab5097357ab95628
SHA512 (PEAR_Manpages-1.10.0.tgz) = 41bb2397c381d6315a355d01554c3c0e1ce38f30c25a56044fa8e0955baac04a39cea2bf1b0398a47c56c381c5373d78864862086ebf6958aed693521f822833
SHA512 (Structures_Graph-1.1.1.tgz) = cd4feb265e1aa05de348645dfc0b8e336486cb02c553dd8fcacb0a1eab452bf54108e07864395d55e0c92f4ffd338a5ae846b2dc28804bb23f03c91864ef0284
SHA512 (XML_Util-1.4.3.tgz) = c21a7cef90743e124c4bc8e0453b634de8f6a6b0aac060acc1a17f481a2eb8757d322b05c69151280b7651cea927b2c64b7d49b9fd815dcdc606d0472d967310
SHA512 (XML_Util-1.4.4.tgz) = 3c2ae4492e76729da561398a43416cd540284297b497d2c1526515c00ba2918b9d520b580e21111cf9f9e133d473289cc9c896bc28ddd0c64a849ee66f897e42