php-pear: 1.10.0

8 files changed, 48 insertions, 1380 deletions

diff --git a/pear.1 b/pear.1
deleted file mode 100644
index ed91290..0000000
--- a/pear.1
+++ /dev/null
@@ -1,271 +0,0 @@
-.TH PEAR 1 "2013" "The PEAR Group" "User commands"
-.SH NAME
-pear, pecl, peardev \- PEAR installer
-
-.SH SYNOPSIS
-.B pear
-[ options ] command [command-options] <parameters>
-.LP
-.B pecl
-[ options ] command [command-options] <parameters>
-.LP
-.B peardev
-[ options ] command [command-options] <parameters>
-.LP
-
-.SH DESCRIPTION
-\fBPEAR\fP is the PHP Extension and Application Repository, found at
-.B http://pear.php.net.
-.P
-.P
-The \fBpear\fP command is used to install PEAR extensions.
-.P
-The \fBpecl\fP command is used to install PECL extensions.
-.P
-The \fBpeardev\fP command is a wrapper for the \fBpear\fP command which
-removes the normal configured memory limit.
-
-.SH OPTIONS
-.TP 15
-.B \-v
-increase verbosity level (default 1)
-.TP
-.B \-q
-be quiet, decrease verbosity level
-.TP
-.B \-c \fIfile\fP
-find user configuration in \fBfile\fP
-.TP
-.B \-C \fIfile\fP
-find system configuration in \fBfile\fP
-.TP
-.B \-d \fIfoo=bar\fP
-set user config variable \fBfoo\fP to \fBbar\fP
-.TP
-.B \-D \fIfoo=bar\fP
-set system config variable \fBfoo\fP to \fBbar\fP
-.TP
-.B \-G
-start in graphical (Gtk) mode
-.TP
-.B \-S
-store system configuration
-.TP
-.B \-s
-store user configuration
-.TP
-.B \-y \fIfoo\fP
-unset
-.B foo
-in the user configuration
-.TP
-.B \-V
-version information
-.TP
-.PD 0
-.B \-h
-.TP
-.PD 1
-.B \-?
-display help/usage
-
-.SH COMMANDS
-.TP 15
-.B build
-Build an Extension From C Source
-.TP
-.B bundle
-Unpacks a Pecl Package
-.TP
-.B channel-add
-Add a Channel
-.TP
-.B channel-alias
-Specify an alias to a channel name
-.TP
-.B channel-delete
-Remove a Channel From the List
-.TP
-.B channel-discover
-Initialize a Channel from its server
-.TP
-.B channel-info
-Retrieve Information on a Channel
-.TP
-.TP
-.B channel-login
-Connects and authenticates to remote channel server
-.TP
-.B channel-logout
-Logs out from the remote channel server
-.TP
-.B channel-update
-Update an Existing Channel
-.TP
-.B clear-cache
-Clear Web Services Cache
-.TP
-.B config-create
-Create a Default configuration file
-.TP
-.B config-get
-Show One Setting
-.TP
-.B config-help
-Show Information About Setting
-.TP
-.B config-set
-Change Setting
-.TP
-.B config-show
-Show All Settings
-.TP
-.B convert
-Convert a package.xml 1.0 to package.xml 2.0 format
-.TP
-.B cvsdiff
-Run a "cvs diff" for all files in a package
-.TP
-.B cvstag
-Set CVS Release Tag
-.TP
-.B download
-Download Package
-.TP
-.B download-all
-Downloads each available package from the default channel
-.TP
-.B info
-Display information about a package
-.TP
-.B install
-Install Package
-.TP
-.B list
-List Installed Packages In The Default Channel
-.TP
-.B list-all
-List All Packages
-.TP
-.B list-channels
-List Available Channels
-.TP
-.B list-files
-List Files In Installed Package
-.TP
-.B list-upgrades
-List Available Upgrades
-.TP
-.B login
-Connects and authenticates to remote server [Deprecated in favor of channel-login]
-.TP
-.B logout
-Logs out from the remote server [Deprecated in favor of channel-logout]
-.TP
-.B make-rpm-spec
-Builds an RPM spec file from a PEAR package
-.TP
-.B makerpm
-Builds an RPM spec file from a PEAR package
-.TP
-.B package
-Build Package
-.TP
-.B package-dependencies
-Show package dependencies
-.TP
-.B package-validate
-Validate Package Consistency
-.TP
-.B pickle
-Build PECL Package
-.TP
-.B remote-info
-Information About Remote Packages
-.TP
-.B remote-list
-List Remote Packages
-.TP
-.B run-scripts
-Run Post-Install Scripts bundled with a package
-.TP
-.B run-tests
-Run Regression Tests
-.TP
-.B search
-Search remote package database
-.TP
-.B shell-test
-Shell Script Test
-.TP
-.B sign
-Sign a package distribution file
-.TP
-.B svntag
-Set SVN Release Tag
-.TP
-.B uninstall
-Un-install Package
-.TP
-.B update-channels
-Update the Channel List
-.TP
-.B upgrade
-Upgrade Package
-.TP
-.B upgrade-all
-Upgrade All Packages [Deprecated in favor of calling upgrade with no parameters]
-
-.SH FILES
-.TP 15
-.B /etc/pear.conf
-The system configuration file.
-.TP
-.B $HOME/.pearrc
-The user configuration.
-
-.SH SEE ALSO
-.TP
-To list all options, use
-.PS
-pear help options
-.TP
-To list all command shortcuts, use
-.PS
-pear help shortcuts
-.TP
-to get the help for the specified command, use
-.PS
-pear help \fIcommand\fP
-.TP
-Documentation for PEAR can be found at 
-.PD 0
-.P
-.B http://pear.php.net/manual/
-
-.SH COPYRIGHT
-Copyright \(co 1997\-2009
-Stig Bakken,
-Gregory Beaver,
-Helgi Þormar Þorbjörnsson,
-Tomas V.V.Cox,
-Martin Jansen.
-.P
-All rights reserved.
-.P
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-.P
-* Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-.P
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-.SH BUGS
-You can view the list of known bugs or report any new bug you found at:
-.PD 0
-.P
-.B http://pear.php.net/bugs/
-
diff --git a/pear.conf.5 b/pear.conf.5
deleted file mode 100644
index 00216e7..0000000
--- a/pear.conf.5
+++ /dev/null
@@ -1,50 +0,0 @@
-.TH PEAR.CONF 5 "2013" "File Formats"
-.SH NAME
-.B pear.conf
-\- configuration file for \fBPEAR\fR applications.
-
-.SH DESCRIPTION
-The \fBpear.conf\fP is used by \fBPEAR\fR applications
-to store their configuration. This file should not be edited.
-.P
-The \fBpear\fR command provides the \fBconfig-show\fR, \fBconfig-get\fR
-and \fBconfig-set\fR sub-commands needed to change the configuration.
-
-.SH FILES
-.TP 15
-.B /etc/pear.conf
-The system configuration file.
-.TP
-.B $HOME/.pearrc
-The user configuration file.
-
-.SH SEE ALSO
-.B pear(1)
-
-.SH COPYRIGHT
-.PD 0
-Copyright \(co 1997\-2009
-Stig Bakken,
-Gregory Beaver,
-Helgi Þormar Þorbjörnsson,
-Tomas V.V.Cox,
-Martin Jansen.
-.P
-All rights reserved.
-.P
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-.P
-* Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-.P
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-.SH BUGS
-You can view the list of known bugs or report any new bug you found at:
-.PD 0
-.P
-.B http://pear.php.net/bugs/
-
diff --git a/peardev.1 b/peardev.1
deleted file mode 100644
index 62180fe..0000000
--- a/peardev.1
+++ /dev/null
@@ -1,2 +0,0 @@
-.so man1/pear.1
-
diff --git a/pecl.1 b/pecl.1
deleted file mode 100644
index 62180fe..0000000
--- a/pecl.1
+++ /dev/null
@@ -1,2 +0,0 @@
-.so man1/pear.1
-
diff --git a/php-pear-1.9.4-restcache.patch b/php-pear-1.9.4-restcache.patch
deleted file mode 100644
index 361309b..0000000
--- a/php-pear-1.9.4-restcache.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-Workaround for:
-
- https://bugzilla.redhat.com/show_bug.cgi?id=747361
-
---- REST.php.restcache
-+++ REST.php
-@@ -234,6 +234,13 @@
-             }
-         }
- 
-+        if (!is_writeable($cache_dir)) {
-+            // If writing to the cache dir is not going to work, silently do nothing.
-+            // An ugly hack, but retains compat with PEAR 1.9.1 where many commands
-+            // work fine as non-root user (w/out write access to default cache dir).
-+            return true;
-+        }
-+
-         if ($cacheid === null && $nochange) {
-             $cacheid = unserialize(implode('', file($cacheidfile)));
-         }
diff --git a/php-pear-dev.spec b/php-pear-dev.spec
deleted file mode 100644
index 4e6be91..0000000
--- a/php-pear-dev.spec
+++ /dev/null
@@ -1,756 +0,0 @@
-# remirepo spec file for php-pear
-# adapted for SCL from
-#
-# Fedora spec file for php-pear
-#
-# License: MIT
-# http://opensource.org/licenses/MIT
-#
-# Please preserve changelog entries
-#
-%{?scl:%scl_package php-pear}
-%{!?scl:%global pkg_name %{name}}
-%{!?scl:%global _root_sysconfdir %{_sysconfdir}}
-%{!?php_version:  %global php_version  %(php -r 'echo PHP_VERSION;' 2>/dev/null)}
-
-%global peardir %{_datadir}/pear
-%global metadir %{_localstatedir}/lib/pear
-
-
-%global getoptver 1.4.1
-%global arctarver 1.4.0
-# 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.3.0
-%global manpages  1.10.0dev2
-
-# Tests are only run with rpmbuild --with tests
-# Can't be run in mock / koji because PEAR is the first package
-%global with_tests 0%{?_with_tests:1}
-
-%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_root_sysconfdir}/rpm; echo $d)
-
-%global pearprever dev3
-
-Summary: PHP Extension and Application Repository framework
-Name: %{?scl_prefix}php-pear
-Version: 1.10.0
-Release: 0.7.%{pearprever}%{?dist}
-Epoch: 1
-# PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD
-# Structures_Graph is LGPLv3+
-License: BSD and LGPLv3+
-Group: Development/Languages
-URL: http://pear.php.net/package/PEAR
-Source0: http://download.pear.php.net/package/PEAR-%{version}%{?pearprever}.tgz
-# wget https://raw.githubusercontent.com/pear/pear-core/stable/install-pear.php
-Source1: install-pear.php
-Source3: strip.php
-Source10: pear.sh
-Source11: pecl.sh
-Source12: peardev.sh
-Source13: macros.pear
-Source21: http://pear.php.net/get/Archive_Tar-%{arctarver}.tgz
-Source22: http://pear.php.net/get/Console_Getopt-%{getoptver}.tgz
-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
-
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: %{?scl_prefix}php(language) > 5.4
-BuildRequires: %{?scl_prefix}php-cli
-BuildRequires: %{?scl_prefix}php-xml
-BuildRequires: gnupg
-%if %{with_tests}
-BuildRequires:  %{_bindir}/phpunit
-%endif
-
-# Temporary
-%{?scl:Obsoletes: %{scl_prefix}fakepear}
-
-Provides:  %{?scl_prefix}php-pear(Console_Getopt) = %{getoptver}
-Provides:  %{?scl_prefix}php-pear(Archive_Tar) = %{arctarver}
-Provides:  %{?scl_prefix}php-pear(PEAR) = %{version}
-Provides:  %{?scl_prefix}php-pear(Structures_Graph) = %{structver}
-Provides:  %{?scl_prefix}php-pear(XML_Util) = %{xmlutil}
-Provides:  %{?scl_prefix}php-pear(PEAR_Manpages) = %{manpages}
-
-Provides:  %{?scl_prefix}php-composer(pear/console_getopt) = %{getoptver}
-Provides:  %{?scl_prefix}php-composer(pear/archive_tar) = %{arctarver}
-Provides:  %{?scl_prefix}php-composer(pear/pear-core-minimal) = %{version}
-Provides:  %{?scl_prefix}php-composer(pear/structures_graph) = %{structver}
-Provides:  %{?scl_prefix}php-composer(pear/xml_util) = %{xmlutil}
-
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1}
-# From other third party
-Obsoletes: php53-pear  <= %{version}
-Obsoletes: php53u-pear <= %{version}
-Obsoletes: php54-pear  <= %{version}
-Obsoletes: php54w-pear <= %{version}
-Obsoletes: php55u-pear <= %{version}
-Obsoletes: php55w-pear <= %{version}
-Obsoletes: php56u-pear <= %{version}
-Obsoletes: php56w-pear <= %{version}
-Obsoletes: php70u-pear <= %{version}
-Obsoletes: php70w-pear <= %{version}
-%endif
-
-%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}}
-# Archive_Tar requires 5.2
-# XML_Util, Structures_Graph require 5.3
-# Console_Getopt requires 5.4
-# PEAR requires 5.4
-Requires:  %{?scl_prefix}php(language) > 5.4
-Requires:  %{?scl_prefix}php-cli
-# phpci detected extension
-# PEAR (date, spl always builtin):
-Requires:  %{?scl_prefix}php-ftp
-Requires:  %{?scl_prefix}php-pcre
-Requires:  %{?scl_prefix}php-posix
-Requires:  %{?scl_prefix}php-tokenizer
-Requires:  %{?scl_prefix}php-xml
-Requires:  %{?scl_prefix}php-zlib
-# Console_Getopt: pcre
-# Archive_Tar: pcre, posix, zlib
-Requires:  %{?scl_prefix}php-bz2
-# Structures_Graph: none
-# XML_Util: pcre
-# optional: overload and xdebug
-%if 0%{?fedora} >= 21 && 0%{!?scl:1}
-%global with_html_dir 0
-# for /var/www/html ownership
-Requires: httpd-filesystem
-%else
-%global with_html_dir 1
-%endif
-
-
-%description
-PEAR is a framework and distribution system for reusable PHP
-components.  This package contains the basic PEAR components.
-
-%prep
-%setup -cT
-
-# Create a usable PEAR directory (used by install-pear.php)
-for archive in %{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE25}
-do
-    tar xzf  $archive --strip-components 1 || tar xzf  $archive --strip-path 1
-    file=${archive##*/}
-    [ -f LICENSE ] && mv LICENSE LICENSE-${file%%-*}
-    [ -f README ]  && mv README  README-${file%%-*}
-
-    tar xzf $archive 'package*xml'
-    [ -f package2.xml ] && mv package2.xml ${file%%-*}.xml \
-                        || mv package.xml  ${file%%-*}.xml
-done
-cp %{SOURCE1} .
-
-# apply patches on used PEAR during install
-# None \o/
-
-sed -e 's/@SCL@/%{?scl:%{scl}_}/' \
-    -e 's:@VARDIR@:%{_localstatedir}:' \
-    -e 's:@BINDIR@:%{_bindir}:' \
-    -e 's:@ETCDIR@:%{_sysconfdir}:' \
-    -e 's:@PREFIX@:%{_prefix}:' \
-    %{SOURCE13} | tee macros.pear
-
-
-%build
-# This is an empty build section.
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-export PHP_PEAR_SYSCONF_DIR=%{_sysconfdir}
-export PHP_PEAR_SIG_KEYDIR=%{_sysconfdir}/pearkeys
-export PHP_PEAR_SIG_BIN=%{_root_bindir}/gpg
-export PHP_PEAR_INSTALL_DIR=%{peardir}
-
-# 1.4.11 tries to write to the cache directory during installation
-# so it's not possible to set a sane default via the environment.
-# The ${PWD} bit will be stripped via relocate.php later.
-export PHP_PEAR_CACHE_DIR=${PWD}%{_localstatedir}/cache/php-pear
-export PHP_PEAR_TEMP_DIR=/var/tmp
-
-install -d $RPM_BUILD_ROOT%{peardir} \
-           $RPM_BUILD_ROOT%{_localstatedir}/cache/php-pear \
-           $RPM_BUILD_ROOT%{_localstatedir}/www/html \
-           $RPM_BUILD_ROOT%{_localstatedir}/lib/pear/pkgxml \
-           $RPM_BUILD_ROOT%{_docdir}/pecl \
-           $RPM_BUILD_ROOT%{_datadir}/tests/pecl \
-           $RPM_BUILD_ROOT%{_sysconfdir}/pear
-
-export INSTALL_ROOT=$RPM_BUILD_ROOT
-
-%{_bindir}/php --version
-
-%{_bindir}/php -dmemory_limit=64M -dshort_open_tag=0 -dsafe_mode=0 \
-         -d 'error_reporting=E_ALL&~E_DEPRECATED' -ddetect_unicode=0 \
-         install-pear.php --force \
-                 --dir      %{peardir} \
-                 --cache    %{_localstatedir}/cache/php-pear \
-                 --config   %{_sysconfdir}/pear \
-                 --bin      %{_bindir} \
-                 --www      %{_localstatedir}/www/html \
-                 --doc      %{_docdir}/pear \
-                 --test     %{_datadir}/tests/pear \
-                 --data     %{_datadir}/pear-data \
-                 --metadata %{metadir} \
-                 --man      %{_mandir} \
-                 %{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE25}
-
-# Replace /usr/bin/* with simple scripts:
-install -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/pear
-install -m 755 %{SOURCE11} $RPM_BUILD_ROOT%{_bindir}/pecl
-install -m 755 %{SOURCE12} $RPM_BUILD_ROOT%{_bindir}/peardev
-# Fix path in SCL
-for exe in pear pecl peardev; do
-    sed -e 's:/usr:%{_prefix}:' \
-        -i $RPM_BUILD_ROOT%{_bindir}/$exe
-done
-
-# Sanitize the pear.conf
-%{_bindir}/php %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf ext_dir >new-pear.conf
-%{_bindir}/php %{SOURCE3} new-pear.conf http_proxy > $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf
-
-%{_bindir}/php -r "print_r(unserialize(substr(file_get_contents('$RPM_BUILD_ROOT%{_sysconfdir}/pear.conf'),17)));"
-
-
-install -m 644 -D macros.pear \
-           $RPM_BUILD_ROOT%{macrosdir}/macros.%{?scl_prefix}pear
-
-# apply patches on installed PEAR tree
-pushd $RPM_BUILD_ROOT%{peardir} 
-# none
-popd
-
-# Why this file here ?
-rm -rf $RPM_BUILD_ROOT/.depdb* $RPM_BUILD_ROOT/.lock $RPM_BUILD_ROOT/.channels $RPM_BUILD_ROOT/.filemap
-
-# Need for re-registrying XML_Util
-install -pm 644 *.xml $RPM_BUILD_ROOT%{_localstatedir}/lib/pear/pkgxml
-
-# make the cli commands available in standard root for SCL build
-%if 0%{?scl:1}
-install -m 755 -d $RPM_BUILD_ROOT%{_root_bindir}
-ln -s %{_bindir}/pear      $RPM_BUILD_ROOT%{_root_bindir}/%{scl_prefix}pear
-%endif
-
-
-%check
-# Check that no bogus paths are left in the configuration, or in
-# the generated registry files.
-grep $RPM_BUILD_ROOT $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1
-grep %{_libdir} $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1
-grep '"/tmp"' $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1
-grep /usr/local $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1
-grep -rl $RPM_BUILD_ROOT $RPM_BUILD_ROOT && exit 1
-
-
-%if %{with_tests}
-cp /etc/php.ini .
-echo "include_path=.:$RPM_BUILD_ROOT%{peardir}:/usr/share/php" >>php.ini
-export PHPRC=$PWD/php.ini
-LOG=$PWD/rpmlog
-ret=0
-
-cd $RPM_BUILD_ROOT%{_datadir}/tests/pear/Structures_Graph/tests
-phpunit \
-   AllTests || ret=1
-
-cd $RPM_BUILD_ROOT%{_datadir}/tests/pear/XML_Util/tests
-%{_bindir}/php \
-   $RPM_BUILD_ROOT/usr/share/pear/pearcmd.php \
-   run-tests \
-   | tee $LOG
-
-cd $RPM_BUILD_ROOT%{_datadir}/tests/pear/Console_Getopt/tests
-%{_bindir}/php \
-   $RPM_BUILD_ROOT/usr/share/pear/pearcmd.php \
-   run-tests \
-   | tee -a $LOG
-
-grep "FAILED TESTS" $LOG && ret=1
-
-exit $ret
-%else
-echo 'Test suite disabled (missing "--with tests" option)'
-%endif
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-rm new-pear.conf
-
-
-%pre
-# Manage relocation of metadata, before update to pear
-if [ -d %{peardir}/.registry -a ! -d %{metadir}/.registry ]; then
-  mkdir -p %{metadir}
-  mv -f %{peardir}/.??* %{metadir}
-fi
-
-
-%post
-# force new value as pear.conf is (noreplace)
-current=$(%{_bindir}/pear config-get test_dir system)
-if [ "$current" != "%{_datadir}/tests/pear" ]; then
-%{_bindir}/pear config-set \
-    test_dir %{_datadir}/tests/pear \
-    system >/dev/null || :
-fi
-
-current=$(%{_bindir}/pear config-get data_dir system)
-if [ "$current" != "%{_datadir}/pear-data" ]; then
-%{_bindir}/pear config-set \
-    data_dir %{_datadir}/pear-data \
-    system >/dev/null || :
-fi
-
-current=$(%{_bindir}/pear config-get metadata_dir system)
-if [ "$current" != "%{metadir}" ]; then
-%{_bindir}/pear config-set \
-    metadata_dir %{metadir} \
-    system >/dev/null || :
-fi
-
-current=$(%{_bindir}/pear config-get -c pecl doc_dir system)
-if [ "$current" != "%{_docdir}/pecl" ]; then
-%{_bindir}/pear config-set \
-    -c pecl \
-    doc_dir %{_docdir}/pecl \
-    system >/dev/null || :
-fi
-
-current=$(%{_bindir}/pear config-get -c pecl test_dir system)
-if [ "$current" != "%{_datadir}/tests/pecl" ]; then
-%{_bindir}/pear config-set \
-    -c pecl \
-    test_dir %{_datadir}/tests/pecl \
-    system >/dev/null || :
-fi
-
-%postun
-if [ $1 -eq 0 -a -d %{metadir}/.registry ] ; then
-  rm -rf %{metadir}/.registry
-fi
-
-
-%files
-%defattr(-,root,root,-)
-%{peardir}
-%dir %{metadir}
-%{metadir}/.channels
-%verify(not mtime size md5) %{metadir}/.depdb
-%verify(not mtime)          %{metadir}/.depdblock
-%verify(not mtime size md5) %{metadir}/.filemap
-%verify(not mtime)          %{metadir}/.lock
-%{metadir}/.registry
-%{metadir}/pkgxml
-%{_bindir}/*
-%config(noreplace) %{_sysconfdir}/pear.conf
-%{macrosdir}/macros.%{?scl_prefix}pear
-%dir %{_localstatedir}/cache/php-pear
-%if %{with_html_dir}
-%dir %{_localstatedir}/www/html
-%endif
-%dir %{_sysconfdir}/pear
-%{!?_licensedir:%global license %%doc}
-%license LICENSE*
-%doc README*
-%dir %{_docdir}/pear
-%doc %{_docdir}/pear/*
-%dir %{_docdir}/pecl
-%dir %{_datadir}/tests
-%dir %{_datadir}/tests/pecl
-%{_datadir}/tests/pear
-%{_datadir}/pear-data
-%if 0%{?scl:1}
-%dir %{_localstatedir}/www
-%{_root_bindir}/%{scl_prefix}pear
-%endif
-%{_mandir}/man1/pear.1*
-%{_mandir}/man1/pecl.1*
-%{_mandir}/man1/peardev.1*
-%{_mandir}/man5/pear.conf.5*
-
-
-%changelog
-* Tue Sep 29 2015 Remi Collet <remi@fedoraproject.org> 1:1.10.0-0.7.dev3
-- update PEAR to 1.10.0dev3
-
-* Thu Sep 17 2015 Remi Collet <remi@fedoraproject.org> 1:1.10.0-0.6.dev2
-- improve obsoletes
-
-* Fri Jul 31 2015 Remi Collet <remi@fedoraproject.org> 1:1.10.0-0.5.dev2
-- update PEAR to 1.10.0dev2
-- drop all patches, merged upstream
-- drop man pages from sources
-- add PEAR_Manpages upstream package
-
-* 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 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 to 1.10.0dev1 (for PHP7)
-
-* Thu Jul 23 2015 Remi Collet <remi@fedoraproject.org> 1:1.9.5-13
-- fix default values in rpm macro file (instead of undefined)
-
-* Tue Jul 21 2015 Remi Collet <remi@fedoraproject.org> 1:1.9.5-12
-- update Console_Getopt to 1.4.1
-- update Structures_Graph to 1.1.1
-
-* Mon Jul 20 2015 Remi Collet <remi@fedoraproject.org> 1:1.9.5-11
-- update Archive_Tar to 1.4.0
-
-* Tue Apr 14 2015 Remi Collet <remi@fedoraproject.org> 1:1.9.5-10
-- update Archive_Tar to 1.3.16 (no change)
-
-* Thu Mar  5 2015 Remi Collet <remi@fedoraproject.org> 1:1.9.5-9
-- update Archive_Tar to 1.3.15 (no change)
-- add composer provides
-
-* Fri Feb 27 2015 Remi Collet <remi@fedoraproject.org> 1:1.9.5-8
-- update XML_Util to 1.3.0
-
-* Fri Feb 27 2015 Remi Collet <remi@fedoraproject.org> 1:1.9.5-7
-- update Structures_Graph to 1.1.0
-
-* Thu Feb 26 2015 Remi Collet <remi@fedoraproject.org> 1:1.9.5-6
-- update Archive_Tar to 1.3.14
-
-* Sun Feb 22 2015 Remi Collet <remi@fedoraproject.org> 1:1.9.5-5
-- update Console_Getopt to 1.4.0
-- raise php minimum version to 5.4
-
-* Wed Dec 24 2014 Remi Collet <remi@fedoraproject.org> 1:1.9.5-4.1
-- Fedora 21 SCL mass rebuild
-- cleanup registry after removal
-
-* Mon Sep  8 2014 Remi Collet <remi@fedoraproject.org> 1:1.9.5-4
-- rebuild for SCL
-
-* Thu Sep  4 2014 Remi Collet <remi@fedoraproject.org> 1:1.9.5-3
-- update Archive_Tar to 1.3.13
-- merge with SCL spec file
-- requires httpd-filesystem for /var/www/html ownership (F21+)
-
-* Mon Aug  4 2014 Remi Collet <remi@fedoraproject.org> 1:1.9.5-2
-- update Archive_Tar to 1.3.12
-
-* Tue Jul 15 2014 Remi Collet <remi@fedoraproject.org> 1:1.9.5-1
-- update to 1.9.5
-
-* Tue Jul  8 2014 Remi Collet <remi@fedoraproject.org> 1:1.9.5-0.1
-- update to 1.9.5dev1
-
-* Sat Jun  7 2014 Remi Collet <remi@fedoraproject.org> 1:1.9.4-28
-- update XML_Util to 1.2.3
-
-* Thu Apr 17 2014 Remi Collet <remi@fedoraproject.org> 1:1.9.4-27
-- revert previous, was a bad solution
-
-* Thu Apr 10 2014 Remi Collet <rcollet@redhat.com> 1:1.9.4-26.1
-- better fix to detect xml.so
-
-* Thu Apr 10 2014 Remi Collet <rcollet@redhat.com> 1:1.9.4-26
-- fix xml.so is shared only with php 5.5+
-
-* Wed Apr  9 2014 Remi Collet <rcollet@redhat.com> 1:1.9.4-25
-- only enable needed extensions for pear/pecl commands
-- fix typo in pear man page
-
-* Tue Feb 11 2014 Remi Collet <rcollet@redhat.com> 1:1.9.4-24
-- Expand path in macros.pear
-- Install macros to /usr/lib/rpm/macros.d where available
-
-* Tue Oct 15 2013 Remi Collet <rcollet@redhat.com> 1:1.9.4-23
-- set pecl test_dir to /usr/share/tests/pecl
-
-* Mon Oct 14 2013 Remi Collet <rcollet@redhat.com> 1:1.9.4-22
-- set pecl doc_dir to /usr/share/doc/pecl
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.9.4-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Jul 10 2013 Remi Collet <rcollet@redhat.com> 1:1.9.4-20
-- add man page for pear.conf file
-
-* Tue Jun 18 2013 Remi Collet <rcollet@redhat.com> 1:1.9.4-19
-- add man pages for pear, peardev and pecl commands
-
-* Fri May  3 2013 Remi Collet <rcollet@redhat.com> 1:1.9.4-18
-- don't verify metadata file content
-
-* Thu Apr 25 2013 Remi Collet <rcollet@redhat.com> 1:1.9.4-17
-- improve post scriptlet to avoid updating pear.conf
-  when not needed
-
-* Wed Mar 20 2013 Remi Collet <remi@fedoraproject.org> 1:1.9.4-16
-- sync with rawhide
-
-* Tue Mar 12 2013 Ralf Corsépius <corsepiu@fedoraproject.org> - 1:1.9.4-16
-- Remove %%config from /etc/rpm/macros.pear
-
-* Sat Feb  9 2013 Remi Collet <remi@fedoraproject.org> 1:1.9.4-15
-- update Archive_Tar to 1.3.11
-- drop php 5.5 patch merged upstream
-
-* Tue Dec 11 2012 Remi Collet <remi@fedoraproject.org> 1:1.9.4-14
-- add explicit requires on all needed extensions (phpci)
-- fix pecl launcher (need ini to be parsed for some
-  extenstions going to be build as shared, mainly simplexml)
-- add fix for new unpack format (php 5.5)
-
-* Fri Nov  9 2012 Remi Collet <remi@fedoraproject.org> 1:1.9.4-12
-- provides value for %%{pear_metadir}
-
-* Wed Sep 26 2012 Remi Collet <remi@fedoraproject.org> 1:1.9.4-12
-- drop relocate stuff, no more needed
-
-* Thu Sep  6 2012 Remi Collet <RPMS@famillecollet.com> 1:1.9.4-11.1
-- obsoletes php53* php54* on EL
-
-* Sun Aug 19 2012 Remi Collet <remi@fedoraproject.org> 1:1.9.4-11
-- move data to /usr/share/pear-data
-- provides all package.xml
-
-* Wed Aug 15 2012 Remi Collet <remi@fedoraproject.org> 1:1.9.4-10
-- enforce test_dir on update
-
-* Mon Aug 13 2012 Remi Collet <remi@fedoraproject.org> 1:1.9.4-9
-- move tests to /usr/share/tests/pear
-- move pkgxml to /var/lib/pear
-- remove XML_RPC
-- refresh installer
-
-* Mon Aug 13 2012 Remi Collet <remi@fedoraproject.org> 1:1.9.4-9
-- remove XML_RPC
-
-* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.9.4-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Wed Apr 11 2012 Remi Collet <remi@fedoraproject.org> 1:1.9.4-7
-- Update Archive_Tar to 1.3.10
-
-* Wed Apr 04 2012 Remi Collet <remi@fedoraproject.org> 1:1.9.4-6
-- fix Obsoletes version for XML_Util (#226295)
-- add link to upstream bug - please Provides LICENSE file
-  https://pear.php.net/bugs/bug.php?id=19368
-- add link to upstream bug - Incorrect FSF address
-  https://pear.php.net/bugs/bug.php?id=19367
-
-* Mon Feb 27 2012 Remi Collet <remi@fedoraproject.org> 1:1.9.4-5
-- Update Archive_Tar to 1.3.9
-- add patch from RHEL (Joe Orton)
-- fix install-pear.php URL (with our patch for doc_dir applied)
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.9.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Sat Oct 15 2011 Remi Collet <remi@fedoraproject.org> 1:1.9.4-3
-- update Archive_Tar to 1.3.8
-- allow to build with "tests" option
-
-* Sat Aug 27 2011 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.4-2
-- update to XML_RPC-1.5.5
-
-* Thu Jul 07 2011 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.4-1
-- update to 1.9.4
-
-* Fri Jun 10 2011 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.3-2
-- fix pecl launcher
-
-* Fri Jun 10 2011 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.3-1
-- update to 1.9.3
-- sync options in launcher (pecl, pear, peardev) with upstream
-
-* Wed Mar 16 2011 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.2-3
-- move %%{pear_docdir} to %%{_docdir}/pear
-  https://fedorahosted.org/fpc/ticket/69
-
-* Tue Mar  8 2011 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.2-2
-- update Console_Getopt to 1.3.1 (no change)
-
-* Mon Feb 28 2011 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.2-1
-- update to 1.9.2 (bug + security fix)
-  http://pear.php.net/advisory-20110228.txt
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.9.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Sun Dec 12 2010 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.1-6
-- update Console_Getopt to 1.3.0
-- don't require php-devel (#657812)
-- update install-pear.php
-
-* Tue Oct 26 2010 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.1-5
-- update Structures_Graph to 1.0.4
-
-* Fri Sep 10 2010 Joe Orton <jorton@redhat.com> - 1:1.9.1-4
-- ship LICENSE file for XML_RPC
-
-* Fri Sep 10 2010 Joe Orton <jorton@redhat.com> - 1:1.9.1-3
-- require php-devel (without which pecl doesn't work)
-
-* Mon Jul 05 2010 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.1-2
-- update to XML_RPC-1.5.4
-
-* Thu May 27 2010 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.1-1
-- update to 1.9.1
-
-* Thu Apr 29 2010 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.0-5
-- update to Archive_Tar-1.3.7 (only metadata fix)
-
-* Tue Mar 09 2010 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.0-4
-- update to Archive_Tar-1.3.6
-
-* Sat Jan 16 2010 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.0-3
-- update to XML_RPC-1.5.3
-- fix licenses (multiple)
-- provide bundled LICENSE files
-
-* Fri Jan 01 2010 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.0-2
-- update to Archive_Tar-1.3.5, Structures_Graph-1.0.3
-
-* Sat Sep 05 2009 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.0-1
-- update to PEAR 1.9.0, XML_RPC 1.5.2
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.8.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Sat May 30 2009 Remi Collet <Fedora@FamilleCollet.com> 1:1.8.1-1
-- update to 1.8.1
-- Update install-pear.php script (1.39)
-- add XML_Util
-
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.7.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sun May 18 2008 Remi Collet <Fedora@FamilleCollet.com> 1:1.7.2-2
-- revert to install-pear.php script 1.31 (for cfg_dir)
-
-* Sun May 18 2008 Remi Collet <Fedora@FamilleCollet.com> 1:1.7.2-1
-- update to 1.7.2
-- Update install-pear.php script (1.32)
-
-* Tue Mar 11 2008 Tim Jackson <rpm@timj.co.uk> 1:1.7.1-2
-- Set cfg_dir to be %%{_sysconfdir}/pear (and own it)
-- Update install-pear.php script
-- Add %%pear_cfgdir and %%pear_wwwdir macros
-
-* Sun Feb  3 2008 Remi Collet <Fedora@FamilleCollet.com> 1:1.7.1-1
-- update to 1.7.1
-
-* Fri Feb  1 2008 Remi Collet <Fedora@FamilleCollet.com> 1:1.7.0-1
-- update to 1.7.0
-
-* Thu Oct  4 2007 Joe Orton <jorton@redhat.com> 1:1.6.2-2
-- require php-cli not php
-
-* Sun Sep  9 2007 Remi Collet <Fedora@FamilleCollet.com> 1:1.6.2-1
-- update to 1.6.2
-- remove patches merged upstream
-- Fix : "pear install" hangs on non default channel (#283401)
-
-* Tue Aug 21 2007 Joe Orton <jorton@redhat.com> 1:1.6.1-2
-- fix License
-
-* Thu Jul 19 2007 Remi Collet <Fedora@FamilleCollet.com> 1:1.6.1-1
-- update to PEAR-1.6.1 and Console_Getopt-1.2.3
-
-* Thu Jul 19 2007 Remi Collet <Fedora@FamilleCollet.com> 1:1.5.4-5
-- new SPEC using install-pear.php instead of install-pear-nozlib-1.5.4.phar
-
-* Mon Jul 16 2007 Remi Collet <Fedora@FamilleCollet.com> 1:1.5.4-4
-- update macros.pear (without define)
-
-* Mon Jul 16 2007 Joe Orton <jorton@redhat.com> 1:1.5.4-3
-- add pecl_{un,}install macros to macros.pear (from Remi)
-
-* Fri May 11 2007 Joe Orton <jorton@redhat.com> 1:1.5.4-2
-- update to 1.5.4
-
-* Tue Mar  6 2007 Joe Orton <jorton@redhat.com> 1:1.5.0-3
-- add redundant build section (#226295)
-- BR php-cli not php (#226295)
-
-* Mon Feb 19 2007 Joe Orton <jorton@redhat.com> 1:1.5.0-2
-- update builtin module provides (Remi Collet, #226295)
-- drop patch 0
-
-* Thu Feb 15 2007 Joe Orton <jorton@redhat.com> 1:1.5.0-1
-- update to 1.5.0
-
-* Mon Feb  5 2007 Joe Orton <jorton@redhat.com> 1:1.4.11-4
-- fix Group, mark pear.conf noreplace (#226295)
-
-* Mon Feb  5 2007 Joe Orton <jorton@redhat.com> 1:1.4.11-3
-- use BuildArch not BuildArchitectures (#226925)
-- fix to use preferred BuildRoot (#226925)
-- strip more buildroot-relative paths from *.reg
-- force correct gpg path in default pear.conf
-
-* Thu Jan  4 2007 Joe Orton <jorton@redhat.com> 1:1.4.11-2
-- update to 1.4.11
-
-* Fri Jul 14 2006 Joe Orton <jorton@redhat.com> 1:1.4.9-4
-- update to XML_RPC-1.5.0
-- really package macros.pear
-
-* Thu Jul 13 2006 Joe Orton <jorton@redhat.com> 1:1.4.9-3
-- require php-cli
-- add /etc/rpm/macros.pear (Christopher Stone)
-
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1:1.4.9-2.1
-- rebuild
-
-* Mon May  8 2006 Joe Orton <jorton@redhat.com> 1:1.4.9-2
-- update to 1.4.9 (thanks to Remi Collet, #183359)
-- package /usr/share/pear/.pkgxml (#190252)
-- update to XML_RPC-1.4.8
-- bundle the v3.0 LICENSE file
-
-* Tue Feb 28 2006 Joe Orton <jorton@redhat.com> 1:1.4.6-2
-- set cache_dir directory, own /var/cache/php-pear
-
-* Mon Jan 30 2006 Joe Orton <jorton@redhat.com> 1:1.4.6-1
-- update to 1.4.6
-- require php >= 5.1.0 (#178821)
-
-* Fri Dec 30 2005 Tim Jackson <tim@timj.co.uk> 1:1.4.5-6
-- Patches to fix "pear makerpm"
-
-* Wed Dec 14 2005 Joe Orton <jorton@redhat.com> 1:1.4.5-5
-- set default sig_keydir to /etc/pearkeys
-- remove ext_dir setting from /etc/pear.conf (#175673)
-
-* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
-- rebuilt
-
-* Tue Dec  6 2005 Joe Orton <jorton@redhat.com> 1:1.4.5-4
-- fix virtual provide for PEAR package (#175074)
-
-* Sun Dec  4 2005 Joe Orton <jorton@redhat.com> 1:1.4.5-3
-- fix /usr/bin/{pecl,peardev} (#174882)
-
-* Thu Dec  1 2005 Joe Orton <jorton@redhat.com> 1:1.4.5-2
-- add virtual provides (#173806) 
-
-* Wed Nov 23 2005 Joe Orton <jorton@redhat.com> 1.4.5-1
-- initial build (Epoch: 1 to allow upgrade from php-pear-5.x)
diff --git a/php-pear-metadata.patch b/php-pear-metadata.patch
deleted file mode 100644
index 137edcc..0000000
--- a/php-pear-metadata.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-diff -up PEAR/Command/Install.php.metadata PEAR/Command/Install.php
---- PEAR/Command/Install.php.metadata	2011-07-07 00:11:24.000000000 +0200
-+++ PEAR/Command/Install.php	2012-09-26 16:02:29.829393773 +0200
-@@ -556,7 +556,13 @@ Run post-installation scripts in package
-             $packrootphp_dir = $this->installer->_prependPath(
-                 $this->config->get('php_dir', null, 'pear.php.net'),
-                 $options['packagingroot']);
--            $instreg = new PEAR_Registry($packrootphp_dir); // other instreg!
-+            $metadata_dir = $this->config->get('metadata_dir', null, 'pear.php.net');
-+            if ($metadata_dir) {
-+                $metadata_dir = $this->installer->_prependPath(
-+                    $metadata_dir,
-+                    $options['packagingroot']);
-+            }
-+            $instreg = new PEAR_Registry($packrootphp_dir, false, false, $metadata_dir); // other instreg!
- 
-             if ($this->config->get('verbose') > 2) {
-                 $this->ui->outputData('using package root: ' . $options['packagingroot']);
-diff -up PEAR/Config.php.metadata PEAR/Config.php
---- PEAR/Config.php.metadata	2011-07-07 00:11:24.000000000 +0200
-+++ PEAR/Config.php	2012-09-26 16:02:29.831393779 +0200
-@@ -87,6 +87,13 @@ if (getenv('PHP_PEAR_INSTALL_DIR')) {
-     }
- }
- 
-+// Default for metadata_dir
-+if (getenv('PHP_PEAR_METADATA_DIR')) {
-+    define('PEAR_CONFIG_DEFAULT_METADATA_DIR', getenv('PHP_PEAR_METADATA_DIR'));
-+} else {
-+    define('PEAR_CONFIG_DEFAULT_METADATA_DIR', '');
-+}
-+
- // Default for ext_dir
- if (getenv('PHP_PEAR_EXTENSION_DIR')) {
-     define('PEAR_CONFIG_DEFAULT_EXT_DIR', getenv('PHP_PEAR_EXTENSION_DIR'));
-@@ -398,6 +405,13 @@ class PEAR_Config extends PEAR
-             'prompt' => 'PEAR directory',
-             'group' => 'File Locations',
-             ),
-+        'metadata_dir' => array(
-+            'type' => 'directory',
-+            'default' => PEAR_CONFIG_DEFAULT_METADATA_DIR,
-+            'doc' => 'directory where metadata files are installed (registry, filemap, channels, ...)',
-+            'prompt' => 'PEAR metadata directory',
-+            'group' => 'File Locations',
-+            ),
-         'ext_dir' => array(
-             'type' => 'directory',
-             'default' => PEAR_CONFIG_DEFAULT_EXT_DIR,
-@@ -647,7 +661,9 @@ class PEAR_Config extends PEAR
-             $this->configuration['default'][$key] = $info['default'];
-         }
- 
--        $this->_registry['default'] = &new PEAR_Registry($this->configuration['default']['php_dir']);
-+        $this->_registry['default'] = &new PEAR_Registry(
-+            $this->configuration['default']['php_dir'], false, false,
-+            $this->configuration['default']['metadata_dir']);
-         $this->_registry['default']->setConfig($this, false);
-         $this->_regInitialized['default'] = false;
-         //$GLOBALS['_PEAR_Config_instance'] = &$this;
-@@ -754,7 +770,9 @@ class PEAR_Config extends PEAR
-         $this->configuration[$layer] = $data;
-         $this->_setupChannels();
-         if (!$this->_noRegistry && ($phpdir = $this->get('php_dir', $layer, 'pear.php.net'))) {
--            $this->_registry[$layer] = &new PEAR_Registry($phpdir);
-+            $this->_registry[$layer] = &new PEAR_Registry(
-+                $phpdir, false, false,
-+                $this->get('metadata_dir', $layer, 'pear.php.net'));
-             $this->_registry[$layer]->setConfig($this, false);
-             $this->_regInitialized[$layer] = false;
-         } else {
-@@ -911,7 +929,9 @@ class PEAR_Config extends PEAR
- 
-         $this->_setupChannels();
-         if (!$this->_noRegistry && ($phpdir = $this->get('php_dir', $layer, 'pear.php.net'))) {
--            $this->_registry[$layer] = &new PEAR_Registry($phpdir);
-+            $this->_registry[$layer] = &new PEAR_Registry(
-+                $phpdir, false, false,
-+                $this->get('metadata_dir', $layer, 'pear.php.net'));
-             $this->_registry[$layer]->setConfig($this, false);
-             $this->_regInitialized[$layer] = false;
-         } else {
-@@ -1604,7 +1624,9 @@ class PEAR_Config extends PEAR
- 
-                 if (!is_object($this->_registry[$layer])) {
-                     if ($phpdir = $this->get('php_dir', $layer, 'pear.php.net')) {
--                        $this->_registry[$layer] = &new PEAR_Registry($phpdir);
-+                        $this->_registry[$layer] = &new PEAR_Registry(
-+                            $phpdir, false, false,
-+                            $this->get('metadata_dir', $layer, 'pear.php.net'));
-                         $this->_registry[$layer]->setConfig($this, false);
-                         $this->_regInitialized[$layer] = false;
-                     } else {
-@@ -2087,8 +2109,9 @@ class PEAR_Config extends PEAR
-                 if ($layer == 'ftp' || !isset($this->_registry[$layer])) {
-                     continue;
-                 }
--                $this->_registry[$layer] =
--                    &new PEAR_Registry($this->get('php_dir', $layer, 'pear.php.net'));
-+                $this->_registry[$layer] = &new PEAR_Registry(
-+                    $this->get('php_dir', $layer, 'pear.php.net'), false, false,
-+                    $this->get('metadata_dir', $layer, 'pear.php.net'));
-                 $this->_registry[$layer]->setConfig($this, false);
-                 $this->_regInitialized[$layer] = false;
-             }
-diff -up PEAR/DependencyDB.php.metadata PEAR/DependencyDB.php
---- PEAR/DependencyDB.php.metadata	2011-07-07 00:11:24.000000000 +0200
-+++ PEAR/DependencyDB.php	2012-09-26 16:02:29.832393782 +0200
-@@ -122,8 +122,11 @@ class PEAR_DependencyDB
- 
-         $this->_registry = &$this->_config->getRegistry();
-         if (!$depdb) {
--            $this->_depdb = $this->_config->get('php_dir', null, 'pear.php.net') .
--                DIRECTORY_SEPARATOR . '.depdb';
-+            $dir = $this->_config->get('metadata_dir', null, 'pear.php.net');
-+            if (!$dir) {
-+                $dir = $this->_config->get('php_dir', null, 'pear.php.net');
-+            }
-+            $this->_depdb =  $dir . DIRECTORY_SEPARATOR . '.depdb';
-         } else {
-             $this->_depdb = $depdb;
-         }
-@@ -766,4 +769,4 @@ class PEAR_DependencyDB
-             );
-         }
-     }
--}
-\ Pas de fin de ligne à la fin du fichier
-+}
-diff -up PEAR/Installer.php.metadata PEAR/Installer.php
---- PEAR/Installer.php.metadata	2011-07-07 00:11:24.000000000 +0200
-+++ PEAR/Installer.php	2012-09-26 16:03:15.079556967 +0200
-@@ -1162,15 +1162,6 @@ class PEAR_Installer extends PEAR_Downlo
- 
-         $pkgname = $pkg->getName();
-         $channel = $pkg->getChannel();
--        if (isset($this->_options['packagingroot'])) {
--            $regdir = $this->_prependPath(
--                $this->config->get('php_dir', null, 'pear.php.net'),
--                $this->_options['packagingroot']);
--
--            $packrootphp_dir = $this->_prependPath(
--                $this->config->get('php_dir', null, $channel),
--                $this->_options['packagingroot']);
--        }
- 
-         if (isset($options['installroot'])) {
-             $this->config->setInstallRoot($options['installroot']);
-@@ -1182,7 +1173,21 @@ class PEAR_Installer extends PEAR_Downlo
-             $this->config->setInstallRoot(false);
-             $this->_registry = &$this->config->getRegistry();
-             if (isset($this->_options['packagingroot'])) {
--                $installregistry = &new PEAR_Registry($regdir);
-+                $regdir = $this->_prependPath(
-+                    $this->config->get('php_dir', null, 'pear.php.net'),
-+                    $this->_options['packagingroot']);
-+
-+                $metadata_dir = $this->config->get('metadata_dir', null, 'pear.php.net');
-+                if ($metadata_dir) {
-+                    $metadata_dir = $this->_prependPath(
-+                        $metadata_dir,
-+                        $this->_options['packagingroot']);
-+                }
-+                $packrootphp_dir = $this->_prependPath(
-+                    $this->config->get('php_dir', null, $channel),
-+                    $this->_options['packagingroot']);
-+
-+                $installregistry = &new PEAR_Registry($regdir, false, false, $metadata_dir);
-                 if (!$installregistry->channelExists($channel, true)) {
-                     // we need to fake a channel-discover of this channel
-                     $chanobj = $this->_registry->getChannel($channel, true);
-@@ -1820,4 +1825,4 @@ class PEAR_Installer extends PEAR_Downlo
-     }
- 
-     // }}}
--}
-\ Pas de fin de ligne à la fin du fichier
-+}
-diff --git a/PEAR/Registry.php b/PEAR/Registry.php
-index 3a7bbb1..17de529 100644
---- PEAR/Registry.php
-+++ PEAR/Registry.php
-@@ -132,23 +132,26 @@ class PEAR_Registry extends PEAR
-      * @access public
-      */
-     function PEAR_Registry($pear_install_dir = PEAR_INSTALL_DIR, $pear_channel = false,
--                           $pecl_channel = false)
-+                           $pecl_channel = false, $pear_metadata_dir = '')
-     {
-         parent::PEAR();
--        $this->setInstallDir($pear_install_dir);
-+        $this->setInstallDir($pear_install_dir, $pear_metadata_dir);
-         $this->_pearChannel = $pear_channel;
-         $this->_peclChannel = $pecl_channel;
-         $this->_config      = false;
-     }
- 
--    function setInstallDir($pear_install_dir = PEAR_INSTALL_DIR)
-+    function setInstallDir($pear_install_dir = PEAR_INSTALL_DIR, $pear_metadata_dir = '')
-     {
-         $ds = DIRECTORY_SEPARATOR;
-         $this->install_dir = $pear_install_dir;
--        $this->channelsdir = $pear_install_dir.$ds.'.channels';
--        $this->statedir    = $pear_install_dir.$ds.'.registry';
--        $this->filemap     = $pear_install_dir.$ds.'.filemap';
--        $this->lockfile    = $pear_install_dir.$ds.'.lock';
-+        if (!$pear_metadata_dir) {
-+            $pear_metadata_dir = $pear_install_dir;
-+        }
-+        $this->channelsdir = $pear_metadata_dir.$ds.'.channels';
-+        $this->statedir    = $pear_metadata_dir.$ds.'.registry';
-+        $this->filemap     = $pear_metadata_dir.$ds.'.filemap';
-+        $this->lockfile    = $pear_metadata_dir.$ds.'.lock';
-     }
- 
-     function hasWriteAccess()
-@@ -181,7 +184,7 @@ class PEAR_Registry extends PEAR
-     {
-         $this->_config = &$config;
-         if ($resetInstallDir) {
--            $this->setInstallDir($config->get('php_dir'));
-+            $this->setInstallDir($config->get('php_dir'), $config->get('metadata_dir'));
-         }
-     }
- 
-@@ -328,9 +331,9 @@ class PEAR_Registry extends PEAR
-                 $this->_dependencyDB = &PEAR_DependencyDB::singleton($this->_config);
-                 if (PEAR::isError($this->_dependencyDB)) {
-                     // attempt to recover by removing the dep db
--                    if (file_exists($this->_config->get('php_dir', null, 'pear.php.net') .
-+                    if (file_exists($this->_config->get('metadata_dir', null, 'pear.php.net') .
-                         DIRECTORY_SEPARATOR . '.depdb')) {
--                        @unlink($this->_config->get('php_dir', null, 'pear.php.net') .
-+                        @unlink($this->_config->get('metadata_dir', null, 'pear.php.net') .
-                             DIRECTORY_SEPARATOR . '.depdb');
-                     }
- 
-@@ -2328,4 +2331,4 @@ class PEAR_Registry extends PEAR
-         }
-         return $ret;
-     }
--}
-\ No newline at end of file
-+}
diff --git a/php-pear.spec b/php-pear.spec
index 7bba454..d9536c5 100644
--- a/php-pear.spec
+++ b/php-pear.spec
@@ -22,6 +22,7 @@
 # Structures_Graph 1.0.4 - incorrect FSF address
 %global structver 1.1.1
 %global xmlutil   1.3.0
+%global manpages  1.10.0
 
 # Tests are only run with rpmbuild --with tests
 # Can't be run in mock / koji because PEAR is the first package
@@ -29,20 +30,20 @@
 
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_root_sysconfdir}/rpm; echo $d)
 
-#global pearprever dev1
+#global pearprever dev3
 
 Summary: PHP Extension and Application Repository framework
 Name: %{?scl_prefix}php-pear
-Version: 1.9.5
-Release: 14%{?dist}
+Version: 1.10.0
+Release: 1%{?dist}
 Epoch: 1
-# PEAR, Archive_Tar, XML_Util, Console_Getopt are BSD
+# PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD
 # Structures_Graph is LGPLv3+
 License: BSD and LGPLv3+
 Group: Development/Languages
 URL: http://pear.php.net/package/PEAR
 Source0: http://download.pear.php.net/package/PEAR-%{version}%{?pearprever}.tgz
-# wget https://raw.github.com/pear/pear-core/master/install-pear.php
+# wget https://raw.githubusercontent.com/pear/pear-core/stable/install-pear.php
 Source1: install-pear.php
 Source3: strip.php
 Source10: pear.sh
@@ -53,19 +54,7 @@ Source21: http://pear.php.net/get/Archive_Tar-%{arctarver}.tgz
 Source22: http://pear.php.net/get/Console_Getopt-%{getoptver}.tgz
 Source23: http://pear.php.net/get/Structures_Graph-%{structver}.tgz
 Source24: http://pear.php.net/get/XML_Util-%{xmlutil}.tgz
-# Man pages
-# https://github.com/pear/pear-core/pull/14
-Source30: pear.1
-Source31: pecl.1
-Source32: peardev.1
-# https://github.com/pear/pear-core/pull/16
-Source33: pear.conf.5
-
-# From RHEL: ignore REST cache creation failures as non-root user (#747361)
-# TODO See https://github.com/pear/pear-core/commit/dfef86e05211d2abc7870209d69064d448ef53b3#PEAR/REST.php
-Patch0: php-pear-1.9.4-restcache.patch
-# Relocate Metadata
-Patch1: php-pear-metadata.patch
+Source25: http://pear.php.net/get/PEAR_Manpages-%{manpages}.tgz
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -77,11 +66,15 @@ BuildRequires: gnupg
 BuildRequires:  %{_bindir}/phpunit
 %endif
 
+# Temporary
+%{?scl:Obsoletes: %{scl_prefix}fakepear}
+
 Provides:  %{?scl_prefix}php-pear(Console_Getopt) = %{getoptver}
 Provides:  %{?scl_prefix}php-pear(Archive_Tar) = %{arctarver}
 Provides:  %{?scl_prefix}php-pear(PEAR) = %{version}
 Provides:  %{?scl_prefix}php-pear(Structures_Graph) = %{structver}
 Provides:  %{?scl_prefix}php-pear(XML_Util) = %{xmlutil}
+Provides:  %{?scl_prefix}php-pear(PEAR_Manpages) = %{manpages}
 
 Provides:  %{?scl_prefix}php-composer(pear/console_getopt) = %{getoptver}
 Provides:  %{?scl_prefix}php-composer(pear/archive_tar) = %{arctarver}
@@ -99,13 +92,15 @@ Obsoletes: php55u-pear <= %{version}
 Obsoletes: php55w-pear <= %{version}
 Obsoletes: php56u-pear <= %{version}
 Obsoletes: php56w-pear <= %{version}
+Obsoletes: php70u-pear <= %{version}
+Obsoletes: php70w-pear <= %{version}
 %endif
 
 %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}}
 # Archive_Tar requires 5.2
 # XML_Util, Structures_Graph require 5.3
 # Console_Getopt requires 5.4
-# PEAR requires 4.4
+# PEAR requires 5.4
 Requires:  %{?scl_prefix}php(language) > 5.4
 Requires:  %{?scl_prefix}php-cli
 # phpci detected extension
@@ -139,7 +134,7 @@ components.  This package contains the basic PEAR components.
 %setup -cT
 
 # Create a usable PEAR directory (used by install-pear.php)
-for archive in %{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24}
+for archive in %{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE25}
 do
     tar xzf  $archive --strip-components 1 || tar xzf  $archive --strip-path 1
     file=${archive##*/}
@@ -150,10 +145,10 @@ do
     [ -f package2.xml ] && mv package2.xml ${file%%-*}.xml \
                         || mv package.xml  ${file%%-*}.xml
 done
-cp %{SOURCE1} %{SOURCE30} %{SOURCE31} %{SOURCE32} %{SOURCE33} .
+cp %{SOURCE1} .
 
 # apply patches on used PEAR during install
-%patch1 -p0 -b .metadata
+# None \o/
 
 sed -e 's/@SCL@/%{?scl:%{scl}_}/' \
     -e 's:@VARDIR@:%{_localstatedir}:' \
@@ -205,7 +200,8 @@ export INSTALL_ROOT=$RPM_BUILD_ROOT
                  --test     %{_datadir}/tests/pear \
                  --data     %{_datadir}/pear-data \
                  --metadata %{metadir} \
-                 %{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24}
+                 --man      %{_mandir} \
+                 %{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE25}
 
 # Replace /usr/bin/* with simple scripts:
 install -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/pear
@@ -229,10 +225,7 @@ install -m 644 -D macros.pear \
 
 # apply patches on installed PEAR tree
 pushd $RPM_BUILD_ROOT%{peardir} 
- pushd PEAR
-  %__patch -s --no-backup --fuzz 0 -p0 < %{PATCH0}
- popd
-  %__patch -s --no-backup --fuzz 0 -p0 < %{PATCH1}
+# none
 popd
 
 # Why this file here ?
@@ -241,12 +234,6 @@ rm -rf $RPM_BUILD_ROOT/.depdb* $RPM_BUILD_ROOT/.lock $RPM_BUILD_ROOT/.channels $
 # Need for re-registrying XML_Util
 install -pm 644 *.xml $RPM_BUILD_ROOT%{_localstatedir}/lib/pear/pkgxml
 
-# The man pages
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m 644 pear.1 pecl.1 peardev.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-install -d $RPM_BUILD_ROOT%{_mandir}/man5
-install -p -m 644 pear.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5/
-
 # make the cli commands available in standard root for SCL build
 %if 0%{?scl:1}
 install -m 755 -d $RPM_BUILD_ROOT%{_root_bindir}
@@ -393,9 +380,36 @@ fi
 
 
 %changelog
-* Thu Sep 17 2015 Remi Collet <remi@fedoraproject.org> 1:1.9.5-14
+* Wed Oct  7 2015 Remi Collet <remi@fedoraproject.org> 1:1.10.0-1
+- update PEAR and PEAR_Manpages to 1.10.0
+
+* Tue Sep 29 2015 Remi Collet <remi@fedoraproject.org> 1:1.10.0-0.7.dev3
+- update PEAR to 1.10.0dev3
+
+* Thu Sep 17 2015 Remi Collet <remi@fedoraproject.org> 1:1.10.0-0.6.dev2
 - improve obsoletes
 
+* Fri Jul 31 2015 Remi Collet <remi@fedoraproject.org> 1:1.10.0-0.5.dev2
+- update PEAR to 1.10.0dev2
+- drop all patches, merged upstream
+- drop man pages from sources
+- add PEAR_Manpages upstream package
+
+* 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 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 to 1.10.0dev1 (for PHP7)
+
 * Thu Jul 23 2015 Remi Collet <remi@fedoraproject.org> 1:1.9.5-13
 - fix default values in rpm macro file (instead of undefined)