summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-07-30 13:54:48 +0200
committerRemi Collet <fedora@famillecollet.com>2015-07-30 13:54:48 +0200
commitf37e9fd56e4179739a7e87efbe3e9ef002002222 (patch)
treee775b0afd300ce78b2693bdfefe361babae5905f
parent824833cb78637514ce18b988394f68bf018638dc (diff)
php-pear: add patch to skip version check with --packagingroot
-rw-r--r--php-pear-1.10-metadata.patch22
-rw-r--r--php-pear-dev.spec13
2 files changed, 32 insertions, 3 deletions
diff --git a/php-pear-1.10-metadata.patch b/php-pear-1.10-metadata.patch
index 9155a74..00b53e0 100644
--- a/php-pear-1.10-metadata.patch
+++ b/php-pear-1.10-metadata.patch
@@ -333,3 +333,25 @@ index 5b2ce14..29592dc 100644
$info = $param->getParsedPackage();
unset($info['version']);
unset($info['state']);
+From e484e87b800183d680b6830f23c8bef48d1b6ede Mon Sep 17 00:00:00 2001
+From: Remi Collet <fedora@famillecollet.com>
+Date: Thu, 30 Jul 2015 13:37:55 +0200
+Subject: [PATCH] skip check (in base) when packagingroot used (different tree)
+
+---
+ PEAR/Downloader/Package.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/PEAR/Downloader/Package.php b/PEAR/Downloader/Package.php
+index 29592dc..70ea8c3 100644
+--- a/PEAR/Downloader/Package.php
++++ b/PEAR/Downloader/Package.php
+@@ -425,7 +425,7 @@ public static function removeInstalled(&$params)
+ $params[$i] = false;
+ }
+ } elseif (!isset($options['force']) && !isset($options['upgrade']) &&
+- !isset($options['soft'])) {
++ !isset($options['soft']) && !isset($options['packagingroot'])) {
+ $info = $param->getParsedPackage();
+ $param->_downloader->log(1, 'Skipping package "' .
+ $param->getShortName() .
diff --git a/php-pear-dev.spec b/php-pear-dev.spec
index f759645..d29e41d 100644
--- a/php-pear-dev.spec
+++ b/php-pear-dev.spec
@@ -33,7 +33,7 @@
Summary: PHP Extension and Application Repository framework
Name: %{?scl_prefix}php-pear
Version: 1.10.0
-Release: 0.3.%{pearprever}%{?dist}
+Release: 0.4.%{pearprever}%{?dist}
Epoch: 1
# PEAR, Archive_Tar, XML_Util, Console_Getopt are BSD
# Structures_Graph is LGPLv3+
@@ -65,7 +65,8 @@ Source33: pear.conf.5
# https://github.com/pear/pear-core/pull/42
Patch0: php-pear-1.10-restcache.patch
# Relocate Metadata
-# https://github.com/pear/pear-core/pull/43
+# https://github.com/pear/pear-core/pull/44
+# https://github.com/pear/pear-core/pull/45
Patch1: php-pear-1.10-metadata.patch
BuildArch: noarch
@@ -404,11 +405,17 @@ fi
%changelog
+* Thu Jul 30 2015 Remi Collet <remi@fedoraproject.org> 1:1.10.0-0.4.dev1
+- add patch to skip version check with --packagingroot
+- open https://github.com/pear/pear-core/pull/45
+
* Sun Jul 26 2015 Remi Collet <remi@fedoraproject.org> 1:1.10.0-0.3.dev1
-- patch from PR 42 (merged) and 43 (submitted)
+- patch from PR 42 (merged) and 44 (merged)
* Sun Jul 26 2015 Remi Collet <remi@fedoraproject.org> 1:1.10.0-0.2.dev1
- improve metadata patch
+- open https://github.com/pear/pear-core/pull/42
+- open https://github.com/pear/pear-core/pull/44
* Sat Jul 25 2015 Remi Collet <remi@fedoraproject.org> 1:1.10.0-0.1.dev1
- update PEAR 1.10.0dev1 (for PHP7)