[packages/phploc] use symfony in php dirs

glen glen at pld-linux.org
Wed Nov 25 23:40:32 CET 2015


commit 5b118088c15685975f6680589ae08686b8f90503
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Nov 26 00:40:24 2015 +0200

    use symfony in php dirs

 autoload.patch | 11 +++++++++++
 phploc.spec    | 13 +++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/phploc.spec b/phploc.spec
index 419ff79..d4e542f 100644
--- a/phploc.spec
+++ b/phploc.spec
@@ -1,28 +1,32 @@
+%define		pearname	%{name}
 %include	/usr/lib/rpm/macros.php
 Summary:	A tool for quickly measuring the size of a PHP project
 Name:		phploc
 Version:	2.0.4
-Release:	1
+Release:	2
 License:	BSD
 Group:		Development/Languages/PHP
 Source0:	http://pear.phpunit.de/get/%{name}-%{version}.tgz
 # Source0-md5:	2d8cf318bc1c2c9f631dc6aede63bcf6
-URL:		http://pear.phpunit.de/package/phploc/
+Patch0:		autoload.patch
+URL:		https://github.com/sebastianbergmann/phploc
 BuildRequires:	php-channel(pear.phpunit.de)
 BuildRequires:	php-pear-PEAR >= 1:1.9.4
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
-BuildRequires:	rpmbuild(macros) >= 1.610
+BuildRequires:	rpmbuild(macros) >= 1.654
 Requires:	php(tokenizer)
 Requires:	php-channel(pear.phpunit.de)
 Requires:	php-pear
 Requires:	php-phpunit-FinderFacade >= 1.1.0
 Requires:	php-phpunit-Git >= 1.0.0
 Requires:	php-phpunit-Version >= 1.0.0
-Requires:	php-symfony2-Console >= 2.2.0
+Requires:	php-symfony2-Console >= 2.7.7
 Obsoletes:	php-phpunit-phploc
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_noautoreq_pear Symfony/Component/.*
+
 %description
 phploc is a tool for quickly measuring the size of a PHP project.
 
@@ -33,6 +37,7 @@ size.
 
 %prep
 %pear_package_setup
+%patch0 -p1
 mv docs/phploc/* .
 
 %install
diff --git a/autoload.patch b/autoload.patch
new file mode 100644
index 0000000..1a6d767
--- /dev/null
+++ b/autoload.patch
@@ -0,0 +1,11 @@
+--- phploc-2.0.4/./usr/share/pear/SebastianBergmann/PHPLOC/autoload.php~	2015-11-26 00:38:56.000000000 +0200
++++ phploc-2.0.4/./usr/share/pear/SebastianBergmann/PHPLOC/autoload.php	2015-11-26 00:39:15.371256072 +0200
+@@ -44,7 +44,7 @@
+ require_once 'SebastianBergmann/FinderFacade/autoload.php';
+ require_once 'SebastianBergmann/Git/autoload.php';
+ require_once 'SebastianBergmann/Version/autoload.php';
+-require_once 'Symfony/Component/Console/autoloader.php';
++require_once 'Symfony/Component/Console/autoload.php';
+ 
+ spl_autoload_register(
+     function($class) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/phploc.git/commitdiff/5b118088c15685975f6680589ae08686b8f90503



More information about the pld-cvs-commit mailing list