[packages/phpcpd] fix autoload for symfony packages
glen
glen at pld-linux.org
Wed Nov 25 23:33:26 CET 2015
commit dea6d880c1a59e512a431ce9f7ec6eab99ceda13
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Nov 26 00:33:19 2015 +0200
fix autoload for symfony packages
autoload.patch | 11 +++++++++++
phpcpd.spec | 7 +++++--
2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/phpcpd.spec b/phpcpd.spec
index a25699e..3fcb3df 100644
--- a/phpcpd.spec
+++ b/phpcpd.spec
@@ -4,17 +4,18 @@
Summary: Copy/Paste Detector (CPD) for PHP code
Name: phpcpd
Version: 2.0.0
-Release: 2
+Release: 3
License: BSD
Group: Development/Languages/PHP
Source0: http://pear.phpunit.de/get/%{pearname}-%{version}.tgz
# Source0-md5: 920b308e47ee3e715fe3ed5dbd86f5cd
+Patch0: autoload.patch
URL: https://github.com/sebastianbergmann/phpcpd
BuildRequires: php-channel(pear.phpunit.de)
BuildRequires: php-packagexml2cl
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 >= 1.3.14-2
@@ -26,6 +27,8 @@ Obsoletes: php-phpunit-phpcpd
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define _noautoreq_pear Symfony/Component/.*
+
%description
Copy/Paste Detector (CPD) for PHP code.
diff --git a/autoload.patch b/autoload.patch
new file mode 100644
index 0000000..74555e3
--- /dev/null
+++ b/autoload.patch
@@ -0,0 +1,11 @@
+--- phpcpd-2.0.0/./usr/share/pear/SebastianBergmann/PHPCPD/autoload.php~ 2015-11-26 00:31:06.000000000 +0200
++++ phpcpd-2.0.0/./usr/share/pear/SebastianBergmann/PHPCPD/autoload.php 2015-11-26 00:31:23.283403218 +0200
+@@ -43,7 +43,7 @@
+
+ require_once 'SebastianBergmann/FinderFacade/autoload.php';
+ require_once 'SebastianBergmann/Version/autoload.php';
+-require_once 'Symfony/Component/Console/autoloader.php';
++require_once 'Symfony/Component/Console/autoload.php';
+ require_once 'PHP/Timer/Autoload.php';
+
+ spl_autoload_register(
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/phpcpd.git/commitdiff/dea6d880c1a59e512a431ce9f7ec6eab99ceda13
More information about the pld-cvs-commit
mailing list