[packages/magento] use _noautoreq_pear

glen glen at pld-linux.org
Thu May 22 16:12:04 CEST 2014


commit 6121f374e993ecade27150448a88e8b74b4d968d
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu May 22 17:11:41 2014 +0300

    use _noautoreq_pear

 magento.spec | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/magento.spec b/magento.spec
index 38538f8..7393335 100644
--- a/magento.spec
+++ b/magento.spec
@@ -9,7 +9,7 @@
 Summary:	An open-source eCommerce platform focused on flexibility and control
 Name:		magento
 Version:	1.4.1.1
-Release:	0.14
+Release:	0.15
 License:	Open Software License (OSL 3.0)
 Group:		Applications/WWW
 Source0:	http://www.magentocommerce.com/downloads/assets/%{version}/%{name}-%{version}.tar.bz2
@@ -29,7 +29,7 @@ Patch6:		local.xml-empty.patch
 URL:		http://www.magentocommerce.com/
 BuildRequires:	rpm-php-pearprov
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.553
+BuildRequires:	rpmbuild(macros) >= 1.654
 Requires:	php(core) >= %{php_min_version}
 Requires:	php(ctype)
 Requires:	php(curl)
@@ -57,14 +57,14 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		_appdir		%{_datadir}/%{_webapp}
 
 # lib/3Dsecure
-%define		libs_3dsecure	pear(XMLParser.php)
-%define		libs_mage		pear(3Dsecure/CentinelClient.php) pear(CentinelErrors.php) pear(CreateController.php) pear(ProfileController.php) pear(Rijndael.php) pear(Varien.*.php) pear(abstract.php) pear(Mage.*.php) pear(Maged/.*.php) pear(app/Mage.php) pear(google.*.php) pear(lib/Varien/.*.php) pear(phpseclib/Crypt/.*) pear(phpseclib/Math/.*) pear(phpseclib/Net/.*) pear(processor.php) pear(xml-processing/.*.php)
-%define		libs_pear		pear(DES.php) pear(Crypt/DES.php) pear(Crypt/Hash.php) pear(Crypt/Random.php) pear(Crypt/TripleDES.php) pear(Math/BigInteger.php) pear(Crypt/RSA.php) pear(PEAR.*) pear(System.php) pear(HTML/Template/IT.php) pear(OS/Guess.php) pear(pearcmd.php)
+%define		libs_3dsecure	XMLParser.php
+%define		libs_mage		3Dsecure/CentinelClient.php CentinelErrors.php CreateController.php ProfileController.php Rijndael.php Varien.*.php abstract.php Mage.*.php Maged/.*.php app/Mage.php google.*.php lib/Varien/.*.php phpseclib/Crypt/.* phpseclib/Math/.* phpseclib/Net/.* processor.php xml-processing/.*.php
+%define		libs_pear		DES.php Crypt/DES.php Crypt/Hash.php Crypt/Random.php Crypt/TripleDES.php Math/BigInteger.php Crypt/RSA.php PEAR.* System.php HTML/Template/IT.php OS/Guess.php pearcmd.php
 
 %if %{without system_zf}
-%define		libs_zf			pear(Zend/.*)
+%define		libs_zf			Zend/.*
 %endif
-%define		_noautopear		%{libs_mage} %{libs_pear} %{libs_3dsecure} %{?libs_zf}
+%define		_noautoreq_pear	%{libs_mage} %{libs_pear} %{libs_3dsecure} %{?libs_zf}
 
 # exclude optional php dependencies
 %define		_noautophp	php-sqlite
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/magento.git/commitdiff/6121f374e993ecade27150448a88e8b74b4d968d



More information about the pld-cvs-commit mailing list