X-Git-Url: https://git.tld-linux.org/?p=packages%2Fphp-pear-PEAR.git;a=blobdiff_plain;f=php-pear-PEAR.spec;h=0f8d1d39bf3d4efcd974da24e8b0b482d0cdc3ce;hp=f451aaf13205b747cc03798d84d6358d78278f3c;hb=HEAD;hpb=1663d68e6e95a0d41ca0b3c2699e64c16efb0434

diff --git a/php-pear-PEAR.spec b/php-pear-PEAR.spec
index f451aaf..8b2449e 100644
--- a/php-pear-PEAR.spec
+++ b/php-pear-PEAR.spec
@@ -6,32 +6,32 @@
 #
 %define		_pearname	PEAR
 %define		_status		stable
-%define		php_name	php%{?php_suffix}
-%define		php_min_version 5.4.0
-%include	/usr/lib/rpm/macros.php
+%define		php_min_version 7.2.0
 Summary:	PEAR Base System
 Summary(pl.UTF-8):	Podstawowy system PEAR
 Name:		php-pear-%{_pearname}
-Version:	1.10.1
-Release:	2
+Version:	1.10.15
+Release:	1
 Epoch:		1
 License:	New BSD License
 Group:		Development/Languages/PHP
-Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
-# Source0-md5:	da3f4d00c7415d39cb57848742e09894
-Source1:	http://pear.php.net/get/Console_Getopt-1.4.1.tgz
-# Source1-md5:	a95c86528f910562772274eefb90ca2c
-Source2:	http://pear.php.net/get/Structures_Graph-1.1.1.tgz
+Source0:	https://pear.php.net/get/%{_pearname}-%{version}.tgz
+# Source0-md5:	07c72ec39bfca48509c90fda5f8bf4ce
+Source1:	https://pear.php.net/get/Console_Getopt-1.4.3.tgz
+# Source1-md5:	78620b71acdf113968c3482845bcbbc2
+Source2:	https://pear.php.net/get/Structures_Graph-1.1.1.tgz
 # Source2-md5:	f1be7827074c4f51eb1af245f0f7c5c4
+Source3:	https://pear.php.net/get/Archive_Tar-1.5.0.tgz
+# Source3-md5:	79bf67d6462beacec5a85f7ae0fa7ae5
 Patch0:		%{name}-sysconfdir.patch
 Patch1:		ext-check.patch
 Patch2:		%{name}-FHS.patch
-URL:		http://pear.php.net/package/PEAR
-BuildRequires:	%{php_name}-pcre
-BuildRequires:	%{php_name}-xml
+URL:		https://pear.php.net/package/PEAR
+BuildRequires:	php(pcre)
+BuildRequires:	php(xml)
 BuildRequires:	/usr/bin/php
 BuildRequires:	rpm-php-pearprov >= 4.4.2-30.1
-BuildRequires:	rpmbuild(macros) >= 1.654
+BuildRequires:	rpmbuild(macros) >= 1.747
 Requires:	%{name}-core = %{epoch}:%{version}-%{release}
 Requires:	/usr/bin/php
 Requires:	php(core) >= %{php_min_version}
@@ -39,10 +39,10 @@ Requires:	php(pcre)
 Requires:	php(xml)
 Requires:	php(zlib)
 Requires:	php-pear >= 4:1.2-1
-Requires:	php-pear-Archive_Tar >= 1.3.11
-Requires:	php-pear-Console_Getopt >= 1.2.3
-Requires:	php-pear-Structures_Graph >= 1.0.4
-Requires:	php-pear-XML_Util >= 1.2.3
+Requires:	php-pear-Archive_Tar >= 1.4.0
+Requires:	php-pear-Console_Getopt >= 1.4.1
+Requires:	php-pear-Structures_Graph >= 1.1.0
+Requires:	php-pear-XML_Util >= 1.3.0
 Requires:	rpm-whiteout
 Suggests:	php-pear-Net_FTP
 Obsoletes:	php-pear-PEAR-Command
@@ -98,8 +98,6 @@ Requires:	php(core) >= %{php_min_version}
 %description core
 This package includes PEAR core classes:
 - PEAR class and PEAR_Error
-- System
-- OS_Guess
 and classes for PHP 5:
 - PEAR_ErrorStack and PEAR_Exception
 
@@ -113,10 +111,10 @@ oraz klasy dla PHP 5:
 
 %prep
 %define __build_dir %{_builddir}/%{_pearname}-%{version}%{?_rc}
-%define	__php_include_path %{__build_dir}/%{_pearname}-%{version}%{?_rc}:%{__build_dir}/%(basename %{SOURCE1} .tgz):%{__build_dir}/%(basename %{SOURCE2} .tgz)
+%define	__php_include_path %{__build_dir}/%{_pearname}-%{version}%{?_rc}:%{__build_dir}/%(basename %{SOURCE1} .tgz):%{__build_dir}/%(basename %{SOURCE2} .tgz):%{__build_dir}/%(basename %{SOURCE3} .tgz)
 %define __pear php -dmemory_limit=-1 -doutput_buffering=1 -dinclude_path="%__php_include_path" %{__build_dir}/%{_pearname}-%{version}%{?_rc}/scripts/pearcmd.php
 
-%setup -q -c -n %{_pearname}-%{version} -a1 -a2
+%setup -q -c -n %{_pearname}-%{version} -a1 -a2 -a3
 %pear_package_setup -z -D -n %{_pearname}-%{version}%{?_rc}
 
 %patch0 -p1
@@ -188,6 +186,8 @@ rm -rf $RPM_BUILD_ROOT
 %{php_pear_dir}/pearcmd.php
 %{php_pear_dir}/peclcmd.php
 %{php_pear_dir}/PEAR/*
+%{php_pear_dir}/OS
+%{php_pear_dir}/System.php
 
 # in -core subpackage
 %exclude %{php_pear_dir}/PEAR/ErrorStack.php
@@ -198,8 +198,6 @@ rm -rf $RPM_BUILD_ROOT
 %files core
 %defattr(644,root,root,755)
 %{php_pear_dir}/PEAR.php
-%{php_pear_dir}/System.php
-%{php_pear_dir}/OS
 %dir %{php_pear_dir}/PEAR
 %{php_pear_dir}/PEAR/ErrorStack.php
 %{php_pear_dir}/PEAR/Exception.php